diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c
index 66e98e2e51..56e27e6dc8 100644
--- a/zebra/if_netlink.c
+++ b/zebra/if_netlink.c
@@ -893,7 +893,7 @@ int netlink_interface_addr(struct nlmsghdr *h, ns_id_t ns_id, int startup)
 
 	if (ifa->ifa_family != AF_INET && ifa->ifa_family != AF_INET6) {
 		zlog_warn(
-			"Invalid address family: %d received from kernel interface addr change: %d",
+			"Invalid address family: %u received from kernel interface addr change: %u",
 			ifa->ifa_family, h->nlmsg_type);
 		return 0;
 	}
@@ -1133,7 +1133,7 @@ int netlink_link_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
 	if (!(ifi->ifi_family == AF_UNSPEC || ifi->ifi_family == AF_BRIDGE
 	      || ifi->ifi_family == AF_INET6)) {
 		zlog_warn(
-			"Invalid address family: %d received from kernel link change: %d",
+			"Invalid address family: %u received from kernel link change: %u",
 			ifi->ifi_family, h->nlmsg_type);
 		return 0;
 	}
diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 5facfa5faa..4a13fbc8e1 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -763,11 +763,9 @@ int netlink_route_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
 		return 0;
 	}
 
-	if (!(rtm->rtm_family == AF_INET || rtm->rtm_family == AF_INET6
-	      || rtm->rtm_family == AF_ETHERNET
-	      || rtm->rtm_family == AF_MPLS)) {
+	if (!(rtm->rtm_family == AF_INET || rtm->rtm_family == AF_INET6)) {
 		zlog_warn(
-			"Invalid address family: %d received from kernel route change: %d",
+			"Invalid address family: %u received from kernel route change: %u",
 			rtm->rtm_family, h->nlmsg_type);
 		return 0;
 	}
@@ -780,10 +778,6 @@ int netlink_route_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
 			   nl_rttype_to_str(rtm->rtm_type),
 			   nl_rtproto_to_str(rtm->rtm_protocol), ns_id);
 
-	/* We don't care about change notifications for the MPLS table. */
-	/* TODO: Revisit this. */
-	if (rtm->rtm_family == AF_MPLS)
-		return 0;
 
 	len = h->nlmsg_len - NLMSG_LENGTH(sizeof(struct rtmsg));
 	if (len < 0) {
@@ -2422,7 +2416,7 @@ int netlink_neigh_change(struct nlmsghdr *h, ns_id_t ns_id)
 		return netlink_ipneigh_change(h, len, ns_id);
 	else {
 		zlog_warn(
-			"Invalid address family: %d received from kernel neighbor change: %d",
+			"Invalid address family: %u received from kernel neighbor change: %u",
 			ndm->ndm_family, h->nlmsg_type);
 		return 0;
 	}
diff --git a/zebra/rule_netlink.c b/zebra/rule_netlink.c
index d683e92bcc..87d3769a5a 100644
--- a/zebra/rule_netlink.c
+++ b/zebra/rule_netlink.c
@@ -206,7 +206,7 @@ int netlink_rule_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
 	frh = NLMSG_DATA(h);
 	if (frh->family != AF_INET && frh->family != AF_INET6) {
 		zlog_warn(
-			"Invalid address family: %d received from kernel rule change: %d",
+			"Invalid address family: %u received from kernel rule change: %u",
 			frh->family, h->nlmsg_type);
 		return 0;
 	}