diff --git a/pbrd/pbr_nht.c b/pbrd/pbr_nht.c
index a69bb00848..57e8cf5742 100644
--- a/pbrd/pbr_nht.c
+++ b/pbrd/pbr_nht.c
@@ -227,7 +227,6 @@ void pbr_nhgroup_add_cb(const char *name)
 	DEBUGD(&pbr_dbg_nht, "%s: Added nexthop-group %s", __PRETTY_FUNCTION__,
 	       name);
 
-	pbr_nht_install_nexthop_group(pnhgc, nhgc->nhg);
 	pbr_map_check_nh_group_change(name);
 }
 
diff --git a/zebra/label_manager.c b/zebra/label_manager.c
index 03cfa572db..6e58f4b925 100644
--- a/zebra/label_manager.c
+++ b/zebra/label_manager.c
@@ -39,6 +39,7 @@
 #include "zebra/label_manager.h"
 #include "zebra/zebra_errors.h"
 #include "zebra/zapi_msg.h"
+#include "zebra/debug.h"
 
 #define CONNECTION_DELAY 5
 
@@ -116,8 +117,9 @@ int release_daemon_label_chunks(uint8_t proto, unsigned short instance)
 	int count = 0;
 	int ret;
 
-	zlog_debug("%s: Releasing chunks for client proto %s, instance %d",
-		   __func__, zebra_route_string(proto), instance);
+	if (IS_ZEBRA_DEBUG_PACKET)
+		zlog_debug("%s: Releasing chunks for client proto %s, instance %d",
+			   __func__, zebra_route_string(proto), instance);
 
 	for (ALL_LIST_ELEMENTS_RO(lbl_mgr.lc_list, node, lmc)) {
 		if (lmc->proto == proto && lmc->instance == instance
@@ -129,7 +131,8 @@ int release_daemon_label_chunks(uint8_t proto, unsigned short instance)
 		}
 	}
 
-	zlog_debug("%s: Released %d label chunks", __func__, count);
+	if (IS_ZEBRA_DEBUG_PACKET)
+		zlog_debug("%s: Released %d label chunks", __func__, count);
 
 	return count;
 }
@@ -371,7 +374,8 @@ int release_label_chunk(uint8_t proto, unsigned short instance, uint32_t start,
 	int ret = -1;
 
 	/* check that size matches */
-	zlog_debug("Releasing label chunk: %u - %u", start, end);
+	if (IS_ZEBRA_DEBUG_PACKET)
+		zlog_debug("Releasing label chunk: %u - %u", start, end);
 	/* find chunk and disown */
 	for (ALL_LIST_ELEMENTS_RO(lbl_mgr.lc_list, node, lmc)) {
 		if (lmc->start != start)
diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index 98bb2eda60..b6a8ee950c 100644
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -1431,12 +1431,10 @@ static void zread_route_add(ZAPI_HANDLER_ARGS)
 
 	if (!CHECK_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP)
 	    || api.nexthop_num == 0) {
-		char buf_prefix[PREFIX_STRLEN];
-
-		prefix2str(&api.prefix, buf_prefix, sizeof(buf_prefix));
 		flog_warn(EC_ZEBRA_RX_ROUTE_NO_NEXTHOPS,
-			  "%s: received a route without nexthops for prefix %s",
-			  __func__, buf_prefix);
+			  "%s: received a route without nexthops for prefix %pFX from client %s",
+			  __func__, &api.prefix,
+			  zebra_route_string(client->proto));
 		XFREE(MTYPE_RE, re);
 		return;
 	}
@@ -1938,9 +1936,10 @@ static void zread_get_label_chunk(struct zserv *client, struct stream *msg,
 			"Unable to assign Label Chunk of size %u to %s instance %u",
 			size, zebra_route_string(proto), instance);
 	else
-		zlog_debug("Assigned Label Chunk %u - %u to %s instance %u",
-			   lmc->start, lmc->end,
-			   zebra_route_string(proto), instance);
+		if (IS_ZEBRA_DEBUG_PACKET)
+			zlog_debug("Assigned Label Chunk %u - %u to %s instance %u",
+				   lmc->start, lmc->end,
+				   zebra_route_string(proto), instance);
 
 stream_failure:
 	return;
diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index dff50ceef4..359585df73 100644
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -9719,8 +9719,9 @@ void zebra_vxlan_sg_replay(ZAPI_HANDLER_ARGS)
 	SET_FLAG(zvrf->flags, ZEBRA_PIM_SEND_VXLAN_SG);
 
 	if (!EVPN_ENABLED(zvrf)) {
-		zlog_debug("VxLAN SG replay request on unexpected vrf %d",
-			zvrf->vrf->vrf_id);
+		if (IS_ZEBRA_DEBUG_VXLAN)
+			zlog_debug("VxLAN SG replay request on unexpected vrf %d",
+				   zvrf->vrf->vrf_id);
 		return;
 	}