diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c
index 10a69ff76..1aedd3453 100644
--- a/src/supplicant-manager/nm-supplicant-config.c
+++ b/src/supplicant-manager/nm-supplicant-config.c
@@ -380,13 +380,15 @@ nm_supplicant_config_add_setting_wireless (NMSupplicantConfig * self,
 
 #define ADD_STRING_VAL(field, name, ucase, unhexify, secret) \
 	if (field) { \
+		int len = -1; \
 		if (ucase) \
 			value = g_ascii_strup (field, -1); \
 		else if (unhexify) { \
 			value = nm_utils_hexstr2bin (field, strlen (field)); \
+			len = strlen (field) / 2; \
 		} else \
 			value = g_strdup (field); \
-		success = nm_supplicant_config_add_option (self, name, value, unhexify ? (strlen (field) / 2) : -1, secret); \
+		success = nm_supplicant_config_add_option (self, name, value, len, secret); \
 		g_free (value); \
 		if (!success) { \
 			nm_warning ("Error adding %s to supplicant config.", name); \
diff --git a/system-settings/plugins/ifcfg/parser.c b/system-settings/plugins/ifcfg/parser.c
index e140be650..834acdfac 100644
--- a/system-settings/plugins/ifcfg/parser.c
+++ b/system-settings/plugins/ifcfg/parser.c
@@ -425,7 +425,7 @@ make_wireless_setting (shvarFile *ifcfg,
 
 		if (len > 32 || len == 0) {
 			g_set_error (error, ifcfg_plugin_error_quark (), 0,
-			             "Invalid SSID '%s' (size %d not between 1 and 32 inclusive)",
+			             "Invalid SSID '%s' (size %zu not between 1 and 32 inclusive)",
 			             value, len);
 			goto error;
 		}
diff --git a/system-settings/plugins/ifcfg/plugin.c b/system-settings/plugins/ifcfg/plugin.c
index 521d302ed..0f6740722 100644
--- a/system-settings/plugins/ifcfg/plugin.c
+++ b/system-settings/plugins/ifcfg/plugin.c
@@ -217,8 +217,8 @@ release_one_connection (gpointer item, gpointer user_data)
 static void
 free_watch (gpointer key, gpointer value, gpointer user_data)
 {
-	int ifd = (int) user_data;
-	int wd = (int) value;
+	int ifd = GPOINTER_TO_INT (user_data);
+	int wd = GPOINTER_TO_INT (value);
 
 	if (inotify_rm_watch (ifd, wd) != 0)
 		PLUGIN_WARN (PLUGIN_NAME, "error removing inotify watch on %s", (char *) key);