diff --git a/src/identity.cc b/src/identity.cc
index e957323..86f2ada 100644
--- a/src/identity.cc
+++ b/src/identity.cc
@@ -91,7 +91,7 @@ namespace pEp {
             else if (value.length() != 2)
                 throw length_error("length of lang must be 2");
             else
-                memcpy(_ident->lang, value.data(), 2);
+                memcpy(_ident->lang, value.c_str(), 3);
         }
 
         string Identity::lang()
diff --git a/src/message_api.cc b/src/message_api.cc
index a7b6319..be64135 100644
--- a/src/message_api.cc
+++ b/src/message_api.cc
@@ -35,8 +35,9 @@ namespace pEp {
             stringlist_t *_keylist = NULL;
             PEP_rating _rating = PEP_rating_undefined;
             PEP_decrypt_flags_t _flags = 0;
+            message *_src = src;
 
-            PEP_STATUS status = decrypt_message(session, src, &_dst, &_keylist,
+            PEP_STATUS status = decrypt_message(session, _src, &_dst, &_keylist,
                     &_rating, &_flags);
             _throw_status(status);
 
diff --git a/src/sync_mixin.cc b/src/sync_mixin.cc
index 34916dc..4a5c48f 100644
--- a/src/sync_mixin.cc
+++ b/src/sync_mixin.cc
@@ -73,7 +73,6 @@ namespace pEp {
 
         int SyncMixIn::inject_sync_msg(void *msg, void *management)
         {
-            // SyncMixIn *that = (SyncMixIn *) management;
             val = 0;
             _msg = msg;
             setjmp(env);
@@ -86,7 +85,6 @@ namespace pEp {
         {
             static int twice = 1;
             twice = !twice;
-            // SyncMixIn *that = (SyncMixIn *) management;
             if (!twice)
                 return (void *) _msg;
             longjmp(env, 1);