diff --git a/src/Makefile b/src/Makefile
index f38afd2..c312707 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,6 +3,8 @@ SHARED=libpEpJNI.so
 JAR=jniadapter.jar
 include Makefile.conf
 
+CXXFLAGS+=-std=c++14
+
 all: $(JAR) $(SHARED)
 
 JAVA_SOURCES=org/pEp/jniadapter/pEpException.java \
@@ -39,16 +41,16 @@ org_pEp_jniadapter_Message.h: org/pEp/jniadapter/Message.java
 	javah $(subst /,.,$(subst .java,,$<))
 
 org_pEp_jniadapter_AbstractEngine.o: %.o: %.cc %.h throw_pEp_exception.hh jniutils.hh
-	$(CXX) -std=c++14 $(CXXFLAGS) $< -o $@
+	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 org_pEp_jniadapter_Engine.o org_pEp_jniadapter_Message.o: %.o: %.cc %.h
-	$(CXX) -std=c++14 $(CXXFLAGS) $< -o $@
+	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 $(LIBRARY): org_pEp_jniadapter_AbstractEngine.o org_pEp_jniadapter_Engine.o org_pEp_jniadapter_Message.o throw_pEp_exception.o jniutils.o basic_api.o
 	ar -r $@ *.o
 
 $(SHARED): $(LIBRARY)
-	$(CXX) $(CXXFLAGS) -shared -o $(SHARED) $(LDFLAGS) -lpEpEngine *.o
+	$(CXX) $(CXXFLAGS) -shared -o $(SHARED) $(LDFLAGS) -lpEpEngine -lpEpAdapter *.o
 
 org/pEp/jniadapter/pEpException.java: pEp.yml2 gen_java_exceptions.ysl2
 	yml2proc -y gen_java_exceptions.ysl2 $< -o $@
diff --git a/src/org_pEp_jniadapter_AbstractEngine.cc b/src/org_pEp_jniadapter_AbstractEngine.cc
index fd7b375..cca7fbd 100644
--- a/src/org_pEp_jniadapter_AbstractEngine.cc
+++ b/src/org_pEp_jniadapter_AbstractEngine.cc
@@ -145,7 +145,6 @@ namespace pEp {
 
         return (PEP_STATUS) result;
     }
-
 }
 
 extern "C" {
@@ -194,8 +193,8 @@ extern "C" {
         )
     {
         shutdown();
-        delete o;
         session(pEp::Adapter::release);
+        delete o;
     }
 
     int examine_identity(pEp_identity *ident, void *arg)