diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
index a9cf0c86c5..003552bc47 100644
--- a/src/core/nm-manager.c
+++ b/src/core/nm-manager.c
@@ -3802,11 +3802,13 @@ platform_query_devices(NMManager *self)
 }
 
 static void
-rfkill_manager_rfkill_changed_cb(NMRfkillManager *rfkill_mgr,
-                                 NMRfkillType     rtype,
-                                 NMRfkillState    udev_state,
-                                 gpointer         user_data)
+rfkill_manager_rfkill_changed_cb(NMRfkillManager          *rfkill_mgr,
+                                 /* NMRfkillType */ guint  rtype,
+                                 /* NMRfkillState */ guint udev_state,
+                                 gpointer                  user_data)
 {
+    nm_assert(rtype < NM_RFKILL_TYPE_MAX);
+
     _rfkill_update(NM_MANAGER(user_data), rtype);
 }
 
diff --git a/src/core/nm-rfkill-manager.c b/src/core/nm-rfkill-manager.c
index 87646227f2..bb6dcfd72c 100644
--- a/src/core/nm-rfkill-manager.c
+++ b/src/core/nm-rfkill-manager.c
@@ -242,7 +242,11 @@ recheck_killswitches(NMRfkillManager *self)
                        nm_rfkill_state_to_string(poll_states[i]));
 
             priv->rfkill_states[i] = poll_states[i];
-            g_signal_emit(self, signals[RFKILL_CHANGED], 0, i, priv->rfkill_states[i]);
+            g_signal_emit(self,
+                          signals[RFKILL_CHANGED],
+                          0,
+                          (guint) i,
+                          (guint) priv->rfkill_states[i]);
         }
     }
 }
@@ -435,6 +439,6 @@ nm_rfkill_manager_class_init(NMRfkillManagerClass *klass)
                                            NULL,
                                            G_TYPE_NONE,
                                            2,
-                                           G_TYPE_UINT,
-                                           G_TYPE_UINT);
+                                           G_TYPE_UINT /* NMRfkillType */,
+                                           G_TYPE_UINT /* NMRfkillState */);
 }