diff --git a/jsonapi-generator/src/jsonapi-generator.cpp b/jsonapi-generator/src/jsonapi-generator.cpp
index b48ebb386..e0dd7659d 100644
--- a/jsonapi-generator/src/jsonapi-generator.cpp
+++ b/jsonapi-generator/src/jsonapi-generator.cpp
@@ -188,7 +188,14 @@ int main(int argc, char *argv[])
 					}
 				}
 
-				if(retvalType != "void") hasOutput = true;
+				QString functionCall("\t\t");
+				if(retvalType != "void")
+				{
+					functionCall += retvalType + " retval = ";
+					hasOutput = true;
+				}
+				functionCall += instanceName + "->" + methodName + "(";
+				functionCall += orderedParamNames.join(", ") + ");\n";
 
 				qDebug() << instanceName << apiPath << retvalType << typeName
 				         << methodName;
@@ -236,15 +243,12 @@ int main(int argc, char *argv[])
 				if(hasOutput) outputParamsSerialization += "\t\t}\n";
 
 				QMap<QString,QString> substitutionsMap;
-				substitutionsMap.insert("instanceName", instanceName);
-				substitutionsMap.insert("methodName", methodName);
 				substitutionsMap.insert("paramsDeclaration", paramsDeclaration);
 				substitutionsMap.insert("inputParamsDeserialization", inputParamsDeserialization);
 				substitutionsMap.insert("outputParamsSerialization", outputParamsSerialization);
-				substitutionsMap.insert("retvalType", retvalType);
-				substitutionsMap.insert("callParamsList", orderedParamNames.join(", "));
 				substitutionsMap.insert("wrapperName", wrapperName);
 				substitutionsMap.insert("headerFileName", headerFileName);
+				substitutionsMap.insert("functionCall", functionCall);
 
 				QFile templFile(sourcePath + "/method-wrapper-template.cpp.tmpl");
 				templFile.open(QIODevice::ReadOnly);
diff --git a/jsonapi-generator/src/method-wrapper-template.cpp.tmpl b/jsonapi-generator/src/method-wrapper-template.cpp.tmpl
index b7fc829e2..417001ec6 100644
--- a/jsonapi-generator/src/method-wrapper-template.cpp.tmpl
+++ b/jsonapi-generator/src/method-wrapper-template.cpp.tmpl
@@ -50,7 +50,7 @@ $%paramsDeclaration%$
 $%inputParamsDeserialization%$
 
 		// call retroshare C++ API
-		$%retvalType%$ retval = $%instanceName%$->$%methodName%$($%callParamsList%$);
+$%functionCall%$
 
 		// serialize out parameters and return value to JSON
 $%outputParamsSerialization%$
diff --git a/libretroshare/src/pqi/authgpg.cc b/libretroshare/src/pqi/authgpg.cc
index ccfb8a260..d9254214a 100644
--- a/libretroshare/src/pqi/authgpg.cc
+++ b/libretroshare/src/pqi/authgpg.cc
@@ -100,7 +100,11 @@ std::string pgp_pwd_callback(void * /*hook*/, const char *uid_title, const char
 	return password ;
 }
 
-void AuthGPG::init(const std::string& path_to_public_keyring,const std::string& path_to_secret_keyring,const std::string& path_to_trustdb,const std::string& pgp_lock_file)
+void AuthGPG::init(
+        const std::string& path_to_public_keyring,
+        const std::string& path_to_secret_keyring,
+        const std::string& path_to_trustdb,
+        const std::string& pgp_lock_file)
 {
 	if(_instance != NULL)
 	{
@@ -108,8 +112,11 @@ void AuthGPG::init(const std::string& path_to_public_keyring,const std::string&
 		std::cerr << "AuthGPG::init() called twice!" << std::endl ;
 	}
 
-	PGPHandler::setPassphraseCallback(pgp_pwd_callback) ;
-	_instance = new AuthGPG(path_to_public_keyring,path_to_secret_keyring,path_to_trustdb,pgp_lock_file) ;
+//	if(cb) PGPHandler::setPassphraseCallback(cb);else
+	PGPHandler::setPassphraseCallback(pgp_pwd_callback);
+	_instance = new AuthGPG( path_to_public_keyring,
+	                         path_to_secret_keyring,
+	                         path_to_trustdb, pgp_lock_file );
 }
 
 void AuthGPG::exit()
diff --git a/libretroshare/src/pqi/authgpg.h b/libretroshare/src/pqi/authgpg.h
index 4ad48c42b..88b2bec59 100644
--- a/libretroshare/src/pqi/authgpg.h
+++ b/libretroshare/src/pqi/authgpg.h
@@ -89,8 +89,8 @@ public:
 class AuthGPGService
 {
 public:
-    AuthGPGService() {};
-    ~AuthGPGService() {};
+	AuthGPGService() {}
+	~AuthGPGService() {}
 
     virtual AuthGPGOperation *getGPGOperation() = 0;
     virtual void setGPGOperation(AuthGPGOperation *operation) = 0;
@@ -98,12 +98,11 @@ public:
 
 class AuthGPG: public p3Config, public RsTickingThread, public PGPHandler
 {
-	public:
-
-		static void init(	const std::string& path_to_pubring, 
-								const std::string& path_to_secring,
-								const std::string& path_to_trustdb,
-								const std::string& pgp_lock_file);
+public:
+	static void init(const std::string& path_to_pubring,
+	        const std::string& path_to_secring,
+	        const std::string& path_to_trustdb,
+	        const std::string& pgp_lock_file);
 
 		static void exit();
 		static AuthGPG *getAuthGPG() { return _instance ; }