diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 58ec444c39..f084644f1a 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -1623,9 +1623,9 @@ nm_utils_ip4_netmask_to_prefix (guint32 netmask)
 	G_STATIC_ASSERT_EXPR (sizeof (int)     == 4);
 	G_STATIC_ASSERT_EXPR (sizeof (netmask) == 4);
 
-	return  (  (netmask != 0)
-	         ? (32 - __builtin_ctz (ntohl (netmask)))
-	         : 0);
+	return  (  (netmask != 0u)
+	         ? (guint32) (32 - __builtin_ctz (ntohl (netmask)))
+	         : 0u);
 }
 
 /**
diff --git a/shared/nm-glib-aux/nm-shared-utils.c b/shared/nm-glib-aux/nm-shared-utils.c
index 5901e87b7a..57c1caeb6b 100644
--- a/shared/nm-glib-aux/nm-shared-utils.c
+++ b/shared/nm-glib-aux/nm-shared-utils.c
@@ -656,7 +656,7 @@ nm_utils_flags2str (const NMUtilsFlags2StrDesc *descs,
 guint32
 _nm_utils_ip4_prefix_to_netmask (guint32 prefix)
 {
-	return prefix < 32 ? ~htonl(0xFFFFFFFF >> prefix) : 0xFFFFFFFF;
+	return prefix < 32 ? ~htonl(0xFFFFFFFFu >> prefix) : 0xFFFFFFFFu;
 }
 
 gconstpointer