diff --git a/src/chatty-buddy-list.c b/src/chatty-buddy-list.c
index d29655d2448749bff14aae6118daa981605267a3..fd90df57b7679b1683d626da65f0e376ea514272 100644
--- a/src/chatty-buddy-list.c
+++ b/src/chatty-buddy-list.c
@@ -2147,7 +2147,7 @@ chatty_blist_update_buddy (PurpleBuddyList *list,
                            PurpleBlistNode *node)
 {
   PurpleBuddy     *buddy;
-  ChattyLog       *log_data = NULL;
+  g_autofree ChattyLog       *log_data = NULL;
   ChattyBlistNode *ui;
 
   g_return_if_fail (PURPLE_BLIST_NODE_IS_BUDDY(node));
diff --git a/src/chatty-conversation.c b/src/chatty-conversation.c
index ecad7954222e76b5e23fa9017a07c12d261d0373..e6fac09423f4e3582a688cf281baa612de26f101 100644
--- a/src/chatty-conversation.c
+++ b/src/chatty-conversation.c
@@ -969,6 +969,7 @@ chatty_conv_parse_message (const gchar* msg)
  *
  * Get the last message from log
  *
+ * Returns: (transfer-full): a #ChattyLog
  */
 ChattyLog*
 chatty_conv_message_get_last_msg (PurpleBuddy *buddy)