diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index b5c2bc6dae..5e0baf807d 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -1060,7 +1060,7 @@ int rib_uninstall_kernel(struct route_node *rn, struct route_entry *re)
 
 	if (info->safi != SAFI_UNICAST) {
 		for (ALL_NEXTHOPS(re->nexthop, nexthop))
-			SET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB);
+			UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB);
 		return ret;
 	}
 
diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 5546b6d316..43895378cd 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -313,7 +313,7 @@ DEFUN (show_ip_rpf,
 {
 	int uj = use_json(argc, argv);
 	return do_show_ip_route(vty, VRF_DEFAULT_NAME, AFI_IP, SAFI_MULTICAST,
-				false, uj, 0, NULL, false, -1, 0);
+				false, uj, 0, NULL, false, 0, 0);
 }
 
 DEFUN (show_ip_rpf_addr,