diff --git a/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp b/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
index 7c2ba72c83b06d852c6a01d1645b73aff22cd404..adfcd25531289ec2275eaf875dcc8e32cf655380 100644
--- a/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
+++ b/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
@@ -57,7 +57,7 @@ void AudioZrtpSession::initializeZid (void)
     _debug("    xdg_config %s\n", xdg_config.c_str());
 
     if (XDG_CACHE_HOME != NULL) {
-	std::string xdg_env = std::string (XDG_CACHE_HOME);
+	std::string xdg_env = std::string (XDG_CACHE_HOME) + _zidFilename;
 	_debug("    xdg_env %s\n", xdg_env.c_str());
 	(xdg_env.length() > 0) ? zidCompleteFilename = xdg_env : zidCompleteFilename = xdg_config;
     } else
diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp
index 17c1a2accb28b5091db0aaf7c9dfd6288a46c09a..1f98b69241b93e5d1781dd7ad334a5113db795d4 100644
--- a/sflphone-common/src/managerimpl.cpp
+++ b/sflphone-common/src/managerimpl.cpp
@@ -613,6 +613,7 @@ ManagerImpl::offHoldCall (const CallID& call_id)
     bool returnValue, is_rec;
     std::string codecName;
 
+    is_rec = false;
 
     _debug ("ManagerImpl::offHoldCall(%s)\n", call_id.c_str());
 
@@ -2194,8 +2195,6 @@ ManagerImpl::createSettingsPath (void)
 
     xdg_config = std::string (HOMEDIR) + DIR_SEPARATOR_STR + ".config" + DIR_SEPARATOR_STR + PROGDIR;
 
-    //_path = std::string (HOMEDIR) + DIR_SEPARATOR_STR + "." + PROGDIR;
-
     if (XDG_CONFIG_HOME != NULL) {
         xdg_env = std::string (XDG_CONFIG_HOME);
         (xdg_env.length() > 0) ? _path = xdg_env
@@ -2507,6 +2506,7 @@ ManagerImpl::getCurrentCodecName (const CallID& id)
     VoIPLink* link = getAccountLink (accountid);
     Call* call = link->getCall(id);
 
+
     if(call->getState() != Call::Active)
 	return "";
     else