diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c
index 352e3b87e8..1267e35097 100644
--- a/bgpd/bgp_rpki.c
+++ b/bgpd/bgp_rpki.c
@@ -1234,7 +1234,8 @@ DEFPY (show_rpki_prefix,
 		const struct pfx_record *record = &matches[i];
 
 		if (record->max_len >= prefix->prefixlen
-		    && ((asn != 0 && asn == record->asn) || asn == 0)) {
+		    && ((asn != 0 && (uint32_t)asn == record->asn)
+			|| asn == 0)) {
 			print_record(&matches[i], vty);
 		}
 	}
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index de39e295ff..8970e9d1d1 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -209,7 +209,7 @@ static int bgp_ifp_destroy(struct interface *ifp)
 	bgp = bgp_lookup_by_vrf_id(ifp->vrf_id);
 
 	if (BGP_DEBUG(zebra, ZEBRA))
-		zlog_debug("Rx Intf del VRF %u IF %s", bgp->vrf_id, ifp->name);
+		zlog_debug("Rx Intf del VRF %u IF %s", ifp->vrf_id, ifp->name);
 
 	if (bgp)
 		bgp_update_interface_nbrs(bgp, ifp, NULL);