diff --git a/daemon/routing.c b/daemon/routing.c
index 0df44fc0d..a195f4d80 100644
--- a/daemon/routing.c
+++ b/daemon/routing.c
@@ -838,13 +838,12 @@ static struct ipaddr *read_addresses(const tal_t *ctx, u8 *ser)
 	struct ipaddr *ipaddrs = tal_arr(ctx, struct ipaddr, 0);
 	int numaddrs = 0;
 	while (cursor < ser + max) {
-		numaddrs += 1;
+		numaddrs++;
 		tal_resize(&ipaddrs, numaddrs);
 		fromwire_ipaddr(&cursor, &max, &ipaddrs[numaddrs-1]);
 		if (cursor == NULL) {
 			/* Parsing address failed */
-			tal_free(ipaddrs);
-			return NULL;
+			return tal_free(ipaddrs);
 		}
 	}
 	return ipaddrs;
diff --git a/wire/fromwire.c b/wire/fromwire.c
index c60619735..fc853da67 100644
--- a/wire/fromwire.c
+++ b/wire/fromwire.c
@@ -169,11 +169,11 @@ void fromwire_ipaddr(const u8 **cursor, size_t *max, struct ipaddr *addr)
 {
 	/* Skip any eventual padding */
 	while (**cursor == 0) {
-		*cursor += 1;
+		(*cursor)++;
 	}
 
 	addr->type = **cursor;
-	*cursor += 1;
+	(*cursor)++;
 	switch (addr->type) {
 	case 1:
 		addr->addrlen = 4;