diff --git a/.gitignore b/.gitignore
index 4dc216c..fa6a597 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ foundation_pEp_jniadapter_Message.*
 foundation_pEp_jniadapter_Identity.h
 throw_pEp_exception.*
 src/java/foundation/pEp/jniadapter/exceptions/*.java
+src/cxx/*.h
 
 CipherSuite.java
 Color.java
diff --git a/Makefile b/Makefile
index 13c9555..470ad26 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,9 @@ all: compile
 compile:
 	$(MAKE) -C src
 
+generate:
+	$(MAKE) -C src codegen
+
 test: compile
 	$(MAKE) -C test/java/foundation/pEp/jniadapter/test/ compile
 
@@ -18,7 +21,8 @@ clean-all: clean clean-doc
 
 clean:
 	$(MAKE) -C src clean
-	$(MAKE) -C test/java/foundation/pEp/jniadapter/test/ clean clean-pep-home
+	$(MAKE) -C test/java/foundation/pEp/jniadapter/test clean clean-pep-home
+	$(MAKE) -C test/java/foundation/pEp/pitytest clean
 
 clean-doc:
 	rm -rf doc/doxygen/cxx
diff --git a/src/Makefile b/src/Makefile
index e651e5f..a1ffa61 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,13 +16,17 @@ ifeq ($(PLATFORM),linux)
     LIB_CXX_DYN_NAME=$(addsuffix .so,$(LIB_CXX_NAME))
 else ifeq ($(PLATFORM),darwin)
     LIB_CXX_DYN_NAME=$(addsuffix .dylib,$(LIB_CXX_NAME))
+else ifeq ($(PLATFORM),os/390)
+     LIB_CXX_DYN_NAME=
 else
     $(error I dont know how to build for $(PLATFORM).)
 endif
 
 LIB_JAVA=$(DIST_DIR)/$(LIB_JAVA_NAME)
 LIB_CXX_STATIC=$(DIST_DIR)/$(LIB_CXX_STATIC_NAME)
+ifdef LIB_CXX_DYN_NAME
 LIB_CXX_DYN=$(DIST_DIR)/$(LIB_CXX_DYN_NAME)
+endif
 
 $(info ------------------ DIST FILES ---------------------)
 $(info LIB_JAVA:        $(LIB_JAVA))
diff --git a/test/java/foundation/pEp/jniadapter/test/Makefile b/test/java/foundation/pEp/jniadapter/test/Makefile
index 43a9fff..d9ffa7a 100644
--- a/test/java/foundation/pEp/jniadapter/test/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/Makefile
@@ -58,6 +58,11 @@ compile:
 	$(MAKE) -C jni150 compile
 
 clean:
+	rm -f utils/model/*.class
+	rm -f utils/transport/fsmqmanager/*.class
+	rm -f utils/transport/fsmqmanager/test/ctx/*.class
+	rm -f utils/transport/fsmqmanager/test/utils/*.class
+	rm -f utils/transport/fsmsgqueue/*.class
 	$(MAKE) -C templateAlice clean
 	$(MAKE) -C templateAliceBob clean
 	$(MAKE) -C basic clean
@@ -72,6 +77,7 @@ clean:
 	$(MAKE) -C jni100 clean
 	$(MAKE) -C jni111 clean
 	$(MAKE) -C jni114 clean
+	$(MAKE) -C jni115 clean
 	$(MAKE) -C jni118 clean
 	$(MAKE) -C jni119 clean
 	$(MAKE) -C jni125 clean
@@ -82,6 +88,7 @@ clean:
 	$(MAKE) -C jni143 clean
 	$(MAKE) -C jni147 clean
 	$(MAKE) -C jni148 clean
+	$(MAKE) -C jni149 clean
 	$(MAKE) -C jni150 clean
 
 clean-pep-home:
diff --git a/test/java/foundation/pEp/pitytest/Makefile b/test/java/foundation/pEp/pitytest/Makefile
index df30d36..8f10d47 100644
--- a/test/java/foundation/pEp/pitytest/Makefile
+++ b/test/java/foundation/pEp/pitytest/Makefile
@@ -19,6 +19,7 @@ compile: $(JAVA_CLASSES)
 clean:
 	rm -f $(JAVA_CLASSES)
 	rm -f *.class
+	rm -f utils/*.class
 	rm -f *.log
 	rm -Rf .gnupg
-	rm -Rf .lldb
\ No newline at end of file
+	rm -Rf .lldb