diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index cf9b327e9b..b439f947de 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -1308,7 +1308,8 @@ static void ospf6_asbr_redistribute_set(struct ospf6 *ospf6, int type)
 {
 	ospf6_zebra_redistribute(type, ospf6->vrf_id);
 
-	ospf6_asbr_status_update(ospf6, ++ospf6->redist_count);
+	++ospf6->redist_count;
+	ospf6_asbr_status_update(ospf6, ospf6->redist_count);
 }
 
 static void ospf6_asbr_redistribute_unset(struct ospf6 *ospf6,
@@ -1330,7 +1331,8 @@ static void ospf6_asbr_redistribute_unset(struct ospf6 *ospf6,
 	}
 
 	ospf6_asbr_routemap_unset(red);
-	ospf6_asbr_status_update(ospf6, --ospf6->redist_count);
+	--ospf6->redist_count;
+	ospf6_asbr_status_update(ospf6, ospf6->redist_count);
 }
 
 /* When an area is unstubified, flood all the external LSAs in the area */
diff --git a/ospf6d/ospf6_nssa.c b/ospf6d/ospf6_nssa.c
index 84f014d680..cd1be3a5b7 100644
--- a/ospf6d/ospf6_nssa.c
+++ b/ospf6d/ospf6_nssa.c
@@ -188,12 +188,15 @@ void ospf6_abr_nssa_check_status(struct ospf6 *ospf6)
 		 * when they are not translating.
 		 */
 		if (old_state != area->NSSATranslatorState) {
-			if (old_state == OSPF6_NSSA_TRANSLATE_DISABLED)
+			if (old_state == OSPF6_NSSA_TRANSLATE_DISABLED) {
+				++ospf6->redist_count;
 				ospf6_asbr_status_update(ospf6,
-							 ++ospf6->redist_count);
-			else
+							 ospf6->redist_count);
+			} else {
+				--ospf6->redist_count;
 				ospf6_asbr_status_update(ospf6,
-							 --ospf6->redist_count);
+							 ospf6->redist_count);
+			}
 		}
 	}
 }
diff --git a/ospf6d/ospf6_route.c b/ospf6d/ospf6_route.c
index a4ed99ea2d..d0c8e3c970 100644
--- a/ospf6d/ospf6_route.c
+++ b/ospf6d/ospf6_route.c
@@ -580,9 +580,7 @@ ospf6_route_lookup_identical(struct ospf6_route *route,
 	for (target = ospf6_route_lookup(&route->prefix, table); target;
 	     target = target->next) {
 		if (target->type == route->type
-		    && (memcmp(&target->prefix, &route->prefix,
-			       sizeof(struct prefix))
-			== 0)
+		    && prefix_same(&target->prefix, &route->prefix)
 		    && target->path.type == route->path.type
 		    && target->path.cost == route->path.cost
 		    && target->path.u.cost_e2 == route->path.u.cost_e2
diff --git a/ospf6d/ospf6_snmp.c b/ospf6d/ospf6_snmp.c
index 92922567e8..fb8c5d6950 100644
--- a/ospf6d/ospf6_snmp.c
+++ b/ospf6d/ospf6_snmp.c
@@ -1039,7 +1039,6 @@ static uint8_t *ospfv3WwLsdbEntry(struct variable *v, oid *name, size_t *length,
 		return SNMP_INTEGER(OSPF6_LSA_IS_KNOWN(lsa->header->type)
 					    ? SNMP_TRUE
 					    : SNMP_FALSE);
-		break;
 	}
 	return NULL;
 }