diff --git a/lib/ip.c b/lib/ip.c
index 01edf0d5..e1bfba49 100644
--- a/lib/ip.c
+++ b/lib/ip.c
@@ -246,7 +246,7 @@ ip4_pton(char *a, ip4_addr *o)
     if (!c != !i)
       return 0;
     l = strtoul(a, &d, 10);
-    if (d != c && *d || l > 255)
+    if (((d != c) && *d) || (l > 255))
       return 0;
     ia = (ia << 8) | l;
     if (c)
diff --git a/nest/rt-fib.c b/nest/rt-fib.c
index 510aa76b..b9c7d2a2 100644
--- a/nest/rt-fib.c
+++ b/nest/rt-fib.c
@@ -554,7 +554,7 @@ next:
       c = 1;
       debug("got %p\n", z);
     }
-  FIB_ITERATE_END;
+  FIB_ITERATE_END(z);
   dump("iter end");
 
   fit_init(&i, &f);