diff --git a/gossipd/routing.c b/gossipd/routing.c
index d44bc4635..db20cec99 100644
--- a/gossipd/routing.c
+++ b/gossipd/routing.c
@@ -1122,7 +1122,7 @@ find_shorter_route(const tal_t *ctx, struct routing_state *rstate,
 		   struct node *src, struct node *dst,
 		   const struct node *me,
 		   struct amount_msat msat,
-		   size_t max_hops,
+		   u32 max_hops,
 		   double fuzz, const struct siphash_seed *base_seed,
 		   struct chan **long_route,
 		   struct amount_msat *fee)
@@ -1245,7 +1245,7 @@ find_route(const tal_t *ctx, struct routing_state *rstate,
 	   struct amount_msat msat,
 	   double riskfactor,
 	   double fuzz, const struct siphash_seed *base_seed,
-	   size_t max_hops,
+	   u32 max_hops,
 	   struct amount_msat *fee)
 {
 	struct node *src, *dst;
@@ -2494,7 +2494,7 @@ struct route_hop *get_route(const tal_t *ctx, struct routing_state *rstate,
 			    u32 final_cltv,
 			    double fuzz, u64 seed,
 			    struct exclude_entry **excluded,
-			    size_t max_hops)
+			    u32 max_hops)
 {
 	struct chan **route;
 	struct amount_msat total_amount;
diff --git a/gossipd/routing.h b/gossipd/routing.h
index 5fc40ca45..779303a8b 100644
--- a/gossipd/routing.h
+++ b/gossipd/routing.h
@@ -385,7 +385,7 @@ struct route_hop *get_route(const tal_t *ctx, struct routing_state *rstate,
 			    double fuzz,
 			    u64 seed,
 			    struct exclude_entry **excluded,
-			    size_t max_hops);
+			    u32 max_hops);
 /* Disable channel(s) based on the given routing failure. */
 void routing_failure(struct routing_state *rstate,
 		     const struct node_id *erring_node,
diff --git a/gossipd/test/run-crc32_of_update.c b/gossipd/test/run-crc32_of_update.c
index e1d80af31..6b25a5c3a 100644
--- a/gossipd/test/run-crc32_of_update.c
+++ b/gossipd/test/run-crc32_of_update.c
@@ -146,7 +146,7 @@ struct route_hop *get_route(const tal_t *ctx UNNEEDED, struct routing_state *rst
 			    double fuzz UNNEEDED,
 			    u64 seed UNNEEDED,
 			    struct exclude_entry **excluded UNNEEDED,
-			    size_t max_hops UNNEEDED)
+			    u32 max_hops UNNEEDED)
 { fprintf(stderr, "get_route called!\n"); abort(); }
 /* Generated stub for gossip_peerd_wire_type_name */
 const char *gossip_peerd_wire_type_name(int e UNNEEDED)
diff --git a/gossipd/test/run-extended-info.c b/gossipd/test/run-extended-info.c
index 0cd73b107..1d44f4649 100644
--- a/gossipd/test/run-extended-info.c
+++ b/gossipd/test/run-extended-info.c
@@ -153,7 +153,7 @@ struct route_hop *get_route(const tal_t *ctx UNNEEDED, struct routing_state *rst
 			    double fuzz UNNEEDED,
 			    u64 seed UNNEEDED,
 			    struct exclude_entry **excluded UNNEEDED,
-			    size_t max_hops UNNEEDED)
+			    u32 max_hops UNNEEDED)
 { fprintf(stderr, "get_route called!\n"); abort(); }
 /* Generated stub for gossip_peerd_wire_type_name */
 const char *gossip_peerd_wire_type_name(int e UNNEEDED)
diff --git a/lightningd/gossip_control.c b/lightningd/gossip_control.c
index 7042940e5..ea37d1560 100644
--- a/lightningd/gossip_control.c
+++ b/lightningd/gossip_control.c
@@ -312,7 +312,7 @@ static struct command_result *json_getroute(struct command *cmd,
 	struct node_id *source;
 	const jsmntok_t *excludetok;
 	struct amount_msat *msat;
-	unsigned *cltv;
+	u32 *cltv;
 	double *riskfactor;
 	const struct exclude_entry **excluded;
 	u32 *max_hops;