diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c
index 925b047d..ca4d11bb 100644
--- a/src/xmpp/connection.c
+++ b/src/xmpp/connection.c
@@ -561,7 +561,7 @@ connection_disconnect(void)
         }
     }
 
-    free(prof_identifier);
+    g_free(prof_identifier);
     prof_identifier = NULL;
 }
 
@@ -1126,7 +1126,7 @@ static void
 _compute_identifier(const char* barejid)
 {
     // in case of reconnect (lost connection)
-    free(prof_identifier);
+    g_free(prof_identifier);
 
     prof_identifier = g_compute_hmac_for_string(G_CHECKSUM_SHA256,
                                                 (guchar*)profanity_instance_id, strlen(profanity_instance_id),
diff --git a/src/xmpp/message.c b/src/xmpp/message.c
index 11efde65..867a7d0c 100644
--- a/src/xmpp/message.c
+++ b/src/xmpp/message.c
@@ -1261,7 +1261,7 @@ _handle_muc_private_message(xmpp_stanza_t* const stanza)
     ProfMessage* message = message_init();
     message->type = PROF_MSG_TYPE_MUCPM;
 
-    const gchar* from = xmpp_stanza_get_from(stanza);
+    const char* from = xmpp_stanza_get_from(stanza);
     if (!from) {
         goto out;
     }
@@ -1360,7 +1360,7 @@ _handle_chat(xmpp_stanza_t* const stanza, gboolean is_mam, gboolean is_carbon, c
         return;
     }
 
-    const gchar* from = xmpp_stanza_get_from(stanza);
+    const char* from = xmpp_stanza_get_from(stanza);
     if (!from) {
         return;
     }