diff --git a/bgpd/bgp_flowspec_util.c b/bgpd/bgp_flowspec_util.c
index 55e7973f81..15b891f25a 100644
--- a/bgpd/bgp_flowspec_util.c
+++ b/bgpd/bgp_flowspec_util.c
@@ -229,9 +229,9 @@ int bgp_flowspec_ip_address(enum bgp_flowspec_util_nlri_t type,
 	case BGP_FLOWSPEC_CONVERT_TO_NON_OPAQUE:
 		if (prefix) {
 			if (prefix_local.family == AF_INET)
-				PREFIX_COPY_IPV4(prefix, &prefix_local)
+				PREFIX_COPY_IPV4(prefix, &prefix_local);
 			else
-				PREFIX_COPY_IPV6(prefix, &prefix_local)
+				PREFIX_COPY_IPV6(prefix, &prefix_local);
 		}
 		break;
 	case BGP_FLOWSPEC_VALIDATE_ONLY:
diff --git a/isisd/isis_bpf.c b/isisd/isis_bpf.c
index 9599077771..454da99e09 100644
--- a/isisd/isis_bpf.c
+++ b/isisd/isis_bpf.c
@@ -215,7 +215,7 @@ int isis_sock_init(struct isis_circuit *circuit)
 
 int isis_recv_pdu_bcast(struct isis_circuit *circuit, uint8_t *ssnpa)
 {
-	int bytesread = 0, bytestoread, offset, one = 1;
+	int bytesread = 0, bytestoread = 0, offset, one = 1;
 	uint8_t *buff_ptr;
 	struct bpf_hdr *bpf_hdr;
 
diff --git a/lib/prefix.h b/lib/prefix.h
index d2cabf3104..b7fdc26369 100644
--- a/lib/prefix.h
+++ b/lib/prefix.h
@@ -479,7 +479,7 @@ extern void apply_mask_ipv4(struct prefix_ipv4 *);
 #define PREFIX_COPY(DST, SRC)                                                  \
 	*((struct prefix *)(DST)) = *((const struct prefix *)(SRC))
 #define PREFIX_COPY_IPV4(DST, SRC)                                             \
-	*((struct prefix_ipv4 *)(DST)) = *((const struct prefix_ipv4 *)(SRC));
+	*((struct prefix_ipv4 *)(DST)) = *((const struct prefix_ipv4 *)(SRC))
 
 extern int prefix_ipv4_any(const struct prefix_ipv4 *);
 extern void apply_classful_mask_ipv4(struct prefix_ipv4 *);
@@ -499,7 +499,7 @@ extern int str2prefix_ipv6(const char *, struct prefix_ipv6 *);
 extern void apply_mask_ipv6(struct prefix_ipv6 *);
 
 #define PREFIX_COPY_IPV6(DST, SRC)                                             \
-	*((struct prefix_ipv6 *)(DST)) = *((const struct prefix_ipv6 *)(SRC));
+	*((struct prefix_ipv6 *)(DST)) = *((const struct prefix_ipv6 *)(SRC))
 
 extern int ip6_masklen(struct in6_addr);
 extern void masklen2ip6(const int, struct in6_addr *);
diff --git a/ospf6d/ospf6_lsdb.c b/ospf6d/ospf6_lsdb.c
index 0892863cf1..c136c558cb 100644
--- a/ospf6d/ospf6_lsdb.c
+++ b/ospf6d/ospf6_lsdb.c
@@ -68,9 +68,9 @@ static void ospf6_lsdb_set_key(struct prefix_ipv6 *key, const void *value,
 #ifdef DEBUG
 static void _lsdb_count_assert(struct ospf6_lsdb *lsdb)
 {
-	struct ospf6_lsa *debug;
+	struct ospf6_lsa *debug, *debugnext;
 	unsigned int num = 0;
-	for (ALL_LSDB(lsdb, debug))
+	for (ALL_LSDB(lsdb, debug, debugnext))
 		num++;
 
 	if (num == lsdb->count)
@@ -78,7 +78,7 @@ static void _lsdb_count_assert(struct ospf6_lsdb *lsdb)
 
 	zlog_debug("PANIC !! lsdb[%p]->count = %d, real = %d", lsdb,
 		   lsdb->count, num);
-	for (ALL_LSDB(lsdb, debug))
+	for (ALL_LSDB(lsdb, debug, debugnext))
 		zlog_debug("%s lsdb[%p]", debug->name, debug->lsdb);
 	zlog_debug("DUMP END");
 
diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index 521f969fcc..3c4dbc5e9c 100644
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -152,7 +152,7 @@ struct rnh *zebra_add_rnh(struct prefix *p, vrf_id_t vrfid, enum rnh_type type,
 		flog_warn(EC_ZEBRA_RNH_NO_TABLE,
 			  "%s(%u): Add RNH %pFX type %s - table not found",
 			  VRF_LOGNAME(vrf), vrfid, p, rnh_type2str(type));
-		exists = false;
+		*exists = false;
 		return NULL;
 	}