diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index 9bc4e6d..a2923fb 100644
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -879,17 +879,17 @@
 
 	  if (strncmp (metric, "+", 1) == 0)
 	    {
-	      if (bgp_info->attr->med/2 + metric_val/2 > ULONG_MAX/2)
-		bgp_info->attr->med = ULONG_MAX-1;
+	      if (bgp_info->attr->med/2 + metric_val/2 > UINT32_MAX/2)
+	        bgp_info->attr->med = UINT32_MAX-1;
 	      else
-		bgp_info->attr->med += metric_val;
+	        bgp_info->attr->med += metric_val;
 	    }
 	  else if (strncmp (metric, "-", 1) == 0)
 	    {
-	      if (bgp_info->attr->med <= metric_val) 
-		bgp_info->attr->med = 0;
+	      if (bgp_info->attr->med <= metric_val)
+	        bgp_info->attr->med = 0;
 	      else
-		bgp_info->attr->med -= metric_val;
+	        bgp_info->attr->med -= metric_val;
 	    }
 	}
     }
diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index 4418c77..aeae8e1 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -765,8 +765,7 @@
 	      && ! ospf_if_is_configured (ospf, &(addr->u.prefix4))
 	      && ospf_network_match_iface(co,p))
 	    {
-		struct ospf_interface *oi;
-		assert(co);
+      	struct ospf_interface *oi;
 		
 		oi = ospf_if_new (ospf, ifp, co->address);
 		oi->connected = co;
diff --git a/zebra/rtadv.c b/zebra/rtadv.c
index a6e2d92..f7d336c 100644
--- a/zebra/rtadv.c
+++ b/zebra/rtadv.c
@@ -35,6 +35,7 @@
 #include "zebra/rtadv.h"
 #include "zebra/debug.h"
 #include "zebra/zserv.h"
+#include "zebra/rib.h"
 
 extern struct zebra_privs_t zserv_privs;