diff --git a/bgpd/bgp_labelpool.c b/bgpd/bgp_labelpool.c
index b2bb49b94396..bf2b3566b4dd 100644
--- a/bgpd/bgp_labelpool.c
+++ b/bgpd/bgp_labelpool.c
@@ -652,11 +652,7 @@ void bgp_lp_event_zebra_up(void)
 	}
 
 	/* round up */
-	if (((float)labels_needed / (float)lp->next_chunksize) >
-	    (labels_needed / lp->next_chunksize))
-		chunks_needed = (labels_needed / lp->next_chunksize) + 1;
-	else
-		chunks_needed = (labels_needed / lp->next_chunksize);
+	chunks_needed = (labels_needed + lp->next_chunksize - 1) / lp->next_chunksize;
 	labels_needed = chunks_needed * lp->next_chunksize;
 
 	/*
diff --git a/zebra/redistribute.c b/zebra/redistribute.c
index 71e7956324b0..6121949ceddd 100644
--- a/zebra/redistribute.c
+++ b/zebra/redistribute.c
@@ -135,10 +135,6 @@ static void zebra_redistribute(struct zserv *client, int type,
 			if (!zebra_check_addr(&rn->p))
 				continue;
 
-			if (type == ZEBRA_ROUTE_ADD && is_table_direct &&
-			    newre->vrf_id != VRF_DEFAULT)
-				continue;
-
 			zsend_redistribute_route(ZEBRA_REDISTRIBUTE_ROUTE_ADD,
 						 client, rn, newre, is_table_direct);
 		}