diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index 51c74de0f..4ed03d933 100644
--- a/clients/cli/settings.c
+++ b/clients/cli/settings.c
@@ -3088,7 +3088,7 @@ nmc_property_bond_allowed_options (NMSetting *setting, const char *prop)
 }
 
 /* --- NM_SETTING_INFINIBAND_SETTING_NAME property setter functions --- */
-/* 'mac-addresss' */
+/* 'mac-address' */
 static gboolean
 nmc_property_ib_set_mac (NMSetting *setting, const char *prop, const char *val, GError **error)
 {
diff --git a/libnm-core/nm-keyfile-reader.c b/libnm-core/nm-keyfile-reader.c
index 910aad8a5..4887e5248 100644
--- a/libnm-core/nm-keyfile-reader.c
+++ b/libnm-core/nm-keyfile-reader.c
@@ -166,7 +166,7 @@ build_address (KeyfileReaderInfo *info, int family, const char *address_str, gui
 	addr = nm_ip_address_new (family, address_str, plen, &error);
 	if (!addr) {
 		handle_warn (info, property_name, NM_KEYFILE_WARN_SEVERITY_WARN,
-		             _("ignoring invalid %s addresss: %s"),
+		             _("ignoring invalid %s address: %s"),
 		            family == AF_INET ? "IPv4" : "IPv6", error->message);
 		g_error_free (error);
 	}
diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c
index 979c2ba66..09781a842 100644
--- a/src/nm-iface-helper.c
+++ b/src/nm-iface-helper.c
@@ -293,7 +293,7 @@ do_early_setup (int *argc, char **argv[])
 		{ "dhcp4-hostname", 'h', 0, G_OPTION_ARG_STRING, &global_opt.dhcp4_hostname, N_("Hostname to send to DHCP server"), N_("barbar") },
 		{ "priority4", '\0', 0, G_OPTION_ARG_INT64, &priority64_v4, N_("Route priority for IPv4"), N_("0") },
 		{ "priority6", '\0', 0, G_OPTION_ARG_INT64, &priority64_v6, N_("Route priority for IPv6"), N_("1024") },
-		{ "iid", 'e', 0, G_OPTION_ARG_STRING, &global_opt.iid_str, N_("Hex-encoded Interface Identifier"), N_("") },
+		{ "iid", 'e', 0, G_OPTION_ARG_STRING, &global_opt.iid_str, N_("Hex-encoded Interface Identifier"), "" },
 
 		/* Logging/debugging */
 		{ "version", 'V', 0, G_OPTION_ARG_NONE, &global_opt.show_version, N_("Print NetworkManager version and exit"), NULL },