diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index ff861a7324..67484efe12 100644
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -2620,11 +2620,9 @@ int bgp_evpn_local_macip_add(struct bgp *bgp, vni_t vni, struct ethaddr *mac,
 		char buf2[INET6_ADDRSTRLEN];
 
 		zlog_err(
-			"%u:Failed to create Type-2 route, VNI %u %s %s MAC %s IP %s",
+			"%u:Failed to create Type-2 route, VNI %u %s MAC %s IP %s",
 			bgp->vrf_id, vpn->vni,
-			CHECK_FLAG(flags, ZEBRA_MAC_TYPE_STICKY) ? "sticky "
-								 : "",
-			CHECK_FLAG(flags, ZEBRA_MAC_TYPE_STICKY) ? "gateway "
+			CHECK_FLAG(flags, ZEBRA_MAC_TYPE_STICKY) ? "sticky gateway"
 								 : "",
 			prefix_mac2str(mac, buf, sizeof(buf)),
 			ipaddr2str(ip, buf2, sizeof(buf2)));
diff --git a/lib/filter.c b/lib/filter.c
index 3eb874728d..fa52fed1c6 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -90,7 +90,7 @@ struct access_master {
 	void (*delete_hook)(struct access_list *);
 };
 
-/* Static structure for IPv4 access_list's master. */
+/* Static structure for mac access_list's master. */
 static struct access_master access_master_mac = {
 	{NULL, NULL},
 	{NULL, NULL},