diff --git a/src/plugins/intel/mm-port-serial-xmmrpc-xmm7360.c b/src/plugins/intel/mm-port-serial-xmmrpc-xmm7360.c
index 96c09180..6a89ab00 100644
--- a/src/plugins/intel/mm-port-serial-xmmrpc-xmm7360.c
+++ b/src/plugins/intel/mm-port-serial-xmmrpc-xmm7360.c
@@ -215,7 +215,7 @@ xmm7360_byte_array_hexlify (GByteArray *buf) {
         gsize string_len;
         string_len = string->len;
         g_string_truncate (string, 48);
-        g_string_append_printf (string, "... (%ld chars)", string_len);
+        g_string_append_printf (string, "... (%" G_GSIZE_FORMAT " chars)", string_len);
     }
 
     return string;
@@ -260,7 +260,7 @@ xmm7360_rpc_args_to_string (GPtrArray *args)
             g_string_append_printf (result, "L(0x%08x)", arg_value_long);
             break;
         case XMM7360_RPC_MSG_ARG_TYPE_STRING:
-            g_string_append_printf (result, "STR(size=%ld)", arg->size);
+            g_string_append_printf (result, "STR(size=%" G_GSIZE_FORMAT ")", arg->size);
             break;
         case XMM7360_RPC_MSG_ARG_TYPE_UNKNOWN:
         default:
diff --git a/src/tests/test-cbm-part.c b/src/tests/test-cbm-part.c
index 89fb4768..9464758f 100644
--- a/src/tests/test-cbm-part.c
+++ b/src/tests/test-cbm-part.c
@@ -31,7 +31,7 @@ static void
 test_cbm_ca (void)
 {
     g_autoptr(GError) err = NULL;
-    MMCbmPart *part;
+    g_autoptr(MMCbmPart) part = NULL;
     guint16 serial;
 
     static const guint8 pdu[] = {
@@ -76,7 +76,7 @@ static void
 test_cbm_ucs2 (void)
 {
     g_autoptr(GError) err = NULL;
-    MMCbmPart *part;
+    g_autoptr(MMCbmPart) part = NULL;
     guint16 serial;
 
     static const guint8 pdu [] = {
@@ -120,7 +120,7 @@ static void
 test_cbm_eu (void)
 {
     g_autoptr(GError) err = NULL;
-    MMCbmPart *part;
+    g_autoptr(MMCbmPart) part = NULL;
     guint16 serial;
 
     static const guint8 pdu[] = {
@@ -199,8 +199,8 @@ test_cbm_nl_2023 (void)
     g_assert_cmpuint (mm_cbm_part_get_part_num (part), ==, 1);
     g_assert_cmpstr (mm_cbm_part_get_text (part), ==,
                      "NL-Alert 04-12-2023 12:00: TESTBERICHT. De overheid waarschuwt je tijdens noodsituaties via N");
+    g_assert_cmpstr (mm_cbm_part_get_language (part), ==, "nl");
     mm_cbm_part_free (part);
-    g_assert_null (mm_cbm_part_get_language (part));
 
     parse_cbm ("\r\n+CBM: 88\r\n46A011130523CC56905D96D35D206519C42E97E7741039EC06DDC37490BA0C6ABFCB7410F95D7683CA6ED03D1C9683D46550BB5C9683D26EF35BDE0ED3D365D03AEC06D9D36E72D9ED02A9542A10B538A5829AC5E9347804\r\n", &part);
     serial = mm_cbm_part_get_serial (part);
@@ -214,8 +214,8 @@ test_cbm_nl_2023 (void)
     g_assert_cmpuint (mm_cbm_part_get_part_num (part), ==, 2);
     g_assert_cmpstr (mm_cbm_part_get_text (part), ==,
                      "L-Alert. Je leest dan wat je moet doen en waar je meer informatie kan vinden. *** TEST MESSAG");
+    g_assert_cmpstr (mm_cbm_part_get_language (part), ==, "nl");
     mm_cbm_part_free (part);
-    g_assert_null (mm_cbm_part_get_language (part));
 
     parse_cbm ("\r\n+CBM: 65\r\n46A0111305334590B34C4797E5ECB09B3C071DDFF6B2DCDD2EBBE920685DCC4E8F41D7B0DC9D769F41D3FC9C5E6EBB40CE37283CA6A7DF6E90BC1CAFA7E565B2AB\r\n", &part);
     serial = mm_cbm_part_get_serial (part);
@@ -229,8 +229,8 @@ test_cbm_nl_2023 (void)
     g_assert_cmpuint (mm_cbm_part_get_part_num (part), ==, 3);
     g_assert_cmpstr (mm_cbm_part_get_text (part), ==,
                      "E Netherlands Government Public Warning System. No action required." );
+    g_assert_cmpstr (mm_cbm_part_get_language (part), ==, "nl");
     mm_cbm_part_free (part);
-    g_assert_null (mm_cbm_part_get_language (part));
 }
 
 
@@ -238,7 +238,7 @@ static void
 test_cbm_gsm7bit_with_lang (void)
 {
     g_autoptr(GError) err = NULL;
-    MMCbmPart *part;
+    g_autoptr(MMCbmPart) part = NULL;
 
     static const guint8 pdu[] = {
         0x40, 0xC0, 0x11, 0x1F, 0x10 /* GSM 7Bit with language */, 0x13,
@@ -261,7 +261,7 @@ static void
 test_cbm_ucs2_with_7bit_lang (void)
 {
     g_autoptr(GError) err = NULL;
-    MMCbmPart *part;
+    g_autoptr(MMCbmPart) part = NULL;
 
     static const guint8 pdu [] = {
         0x63, 0x40, 0x00, 0x32, 0x11 /* UCS2 with 7Bit language */, 0x14,