diff --git a/gtests/net/packetdrill/parser.y b/gtests/net/packetdrill/parser.y
index 4a038abdd992e87b609112852384f34086c47ad4..468e3cf4cb73c73b6108b7e9731edbceb15871cb 100644
--- a/gtests/net/packetdrill/parser.y
+++ b/gtests/net/packetdrill/parser.y
@@ -2047,7 +2047,7 @@ tcp_option
 	}
 }
 ;
-	
+
 sack_block_list
 : sack_block                 { $$ = $1; }
 | sack_block_list sack_block {
@@ -2587,7 +2587,7 @@ spp_hbinterval
 	if (!is_valid_u32($3)) {
 		semantic_error("spp_hbinterval out of range");
 	}
-	$$ = new_integer_expression($3 , "%u"); }
+	$$ = new_integer_expression($3, "%u"); }
 | SPP_HBINTERVAL '=' ELLIPSIS { $$ = new_expression(EXPR_ELLIPSIS); }
 ;
 
@@ -2596,7 +2596,7 @@ spp_pathmtu
 	if (!is_valid_u32($3)) {
 		semantic_error("spp_pathmtu out of range");
 	}
-	$$ = new_integer_expression($3 , "%u"); }
+	$$ = new_integer_expression($3, "%u"); }
 | SPP_PATHMTU '=' ELLIPSIS { $$ = new_expression(EXPR_ELLIPSIS); }
 ;
 
@@ -2605,7 +2605,7 @@ spp_pathmaxrxt
 	if (!is_valid_u16($3)) {
 		semantic_error("spp_pathmaxrxt out of range");
 	}
-	$$ = new_integer_expression($3 , "%u"); }
+	$$ = new_integer_expression($3, "%u"); }
 | SPP_PATHMAXRXT '=' ELLIPSIS { $$ = new_expression(EXPR_ELLIPSIS); }
 ;
 
diff --git a/gtests/net/packetdrill/run_system_call.c b/gtests/net/packetdrill/run_system_call.c
index c28899ffe28d90b32b4d0e200b4461ebde94c67c..e6a0606d38a7e00cbb95d09c729fd40d2d7dbb9e 100644
--- a/gtests/net/packetdrill/run_system_call.c
+++ b/gtests/net/packetdrill/run_system_call.c
@@ -1745,7 +1745,7 @@ static int syscall_getsockopt(struct state *state, struct syscall_spec *syscall,
 				return STATUS_ERR;
 			}
 			if (live_status->sstat_state != state) {
-				asprintf(error, "Bad getsockopt SCTP_STATUS state: expected: %d actual: %d ",
+				asprintf(error, "Bad getsockopt SCTP_STATUS state: expected: %d actual: %d",
 					state, live_status->sstat_state);
 				free(live_optval);
 				return STATUS_ERR;
@@ -1757,7 +1757,7 @@ static int syscall_getsockopt(struct state *state, struct syscall_spec *syscall,
 				return STATUS_ERR;
 			}
 			if (live_status->sstat_rwnd != rwnd) {
-				asprintf(error, "Bad getsockopt SCTP_STATUS rwnd: expected: %u actual: %u ",
+				asprintf(error, "Bad getsockopt SCTP_STATUS rwnd: expected: %u actual: %u",
 					rwnd, live_status->sstat_rwnd);
 				free(live_optval);
 				return STATUS_ERR;
@@ -1904,7 +1904,7 @@ static int syscall_getsockopt(struct state *state, struct syscall_spec *syscall,
 				return STATUS_ERR;
 			}
 			if (live_params->spp_hbinterval != hbinterval) {
-				asprintf(error, "Bad getsockopt SCTP_PARAMS hbinterval: expected: %d actual: %d ",
+				asprintf(error, "Bad getsockopt SCTP_PARAMS hbinterval: expected: %u actual: %u ",
 					hbinterval, live_params->spp_hbinterval);
 				free(live_optval);
 				return STATUS_ERR;
@@ -1916,7 +1916,7 @@ static int syscall_getsockopt(struct state *state, struct syscall_spec *syscall,
 				return STATUS_ERR;
 			}
 			if (live_params->spp_pathmaxrxt != pathmaxrxt) {
-				asprintf(error, "Bad getsockopt SCTP_PARAMS pathmaxrxt: expected: %d actual: %d ",
+				asprintf(error, "Bad getsockopt SCTP_PARAMS pathmaxrxt: expected: %hu actual: %hu ",
 					pathmaxrxt, live_params->spp_pathmaxrxt);
 				free(live_optval);
 				return STATUS_ERR;
@@ -1928,7 +1928,7 @@ static int syscall_getsockopt(struct state *state, struct syscall_spec *syscall,
 				return STATUS_ERR;
 			}
 			if (live_params->spp_pathmtu != pathmtu) {
-				asprintf(error, "Bad getsockopt SCTP_PARAMS pathmtu: expected: %d actual: %d ",
+				asprintf(error, "Bad getsockopt SCTP_PARAMS pathmtu: expected: %u actual: %u ",
 					pathmtu, live_params->spp_pathmtu);
 				free(live_optval);
 				return STATUS_ERR;
diff --git a/gtests/net/packetdrill/symbols_freebsd.c b/gtests/net/packetdrill/symbols_freebsd.c
index 262aa2f0efb2777a7b92147d05c522803d2a7148..4edf8e0b05ce18cf453a8ff64a125f16f290b746 100644
--- a/gtests/net/packetdrill/symbols_freebsd.c
+++ b/gtests/net/packetdrill/symbols_freebsd.c
@@ -85,6 +85,7 @@ struct int_symbol platform_symbols_table[] = {
 	{ SCTP_MAXSEG,                      "SCTP_MAXSEG"                     },
 	{ SCTP_DELAYED_SACK,                "SCTP_DELAYED_SACK"               },
 	{ SCTP_MAX_BURST,                   "SCTP_MAX_BURST"                  },
+	{ SCTP_PEER_ADDR_PARAMS,            "SCTP_PEER_ADDR_PARAMS"           },
 	{ SCTP_STATUS,                      "SCTP_STATUS"                     },
 	{ SCTP_CLOSED,                      "SCTP_CLOSED"                     },
 	{ SCTP_BOUND,                       "SCTP_BOUND"                      },
@@ -96,7 +97,6 @@ struct int_symbol platform_symbols_table[] = {
 	{ SCTP_SHUTDOWN_RECEIVED,           "SCTP_SHUTDOWN_RECEIVED"          },
 	{ SCTP_SHUTDOWN_ACK_SENT,           "SCTP_SHUTDOWN_ACK_SENT"          },
 	{ SCTP_SHUTDOWN_PENDING,            "SCTP_SHUTDOWN_PENDING"           },
-	{ SCTP_PEER_ADDR_PARAMS,            "SCTP_PEER_ADDR_PARAMS"           },
 
 	/* /usr/include/netinet/tcp.h */
 	{ TCP_NODELAY,                      "TCP_NODELAY"                     },
diff --git a/gtests/net/packetdrill/symbols_linux.c b/gtests/net/packetdrill/symbols_linux.c
index efa581baa1b0c22806d565ce2000fdaf315f7e93..2601c3588752c4ee4a5bc5a7eee58abb16d24ed7 100644
--- a/gtests/net/packetdrill/symbols_linux.c
+++ b/gtests/net/packetdrill/symbols_linux.c
@@ -118,6 +118,9 @@ struct int_symbol platform_symbols_table[] = {
 #ifdef SCTP_MAX_BURST
 	{ SCTP_MAX_BURST,                   "SCTP_MAX_BURST"                  },
 #endif
+#ifdef SCTP_PEER_ADDR_PARAMS
+	{ SCTP_PEER_ADDR_PARAMS,            "SCTP_PEER_ADDR_PARAMS"           },
+#endif
 #ifdef SCTP_STATUS
 	{ SCTP_STATUS,                      "SCTP_STATUS"                     },
 #endif
@@ -125,9 +128,6 @@ struct int_symbol platform_symbols_table[] = {
 #if 0
 	{ SCTP_BOUND,                       "SCTP_BOUND"                      },
 	{ SCTP_LISTEN,                      "SCTP_LISTEN"                     },
-#endif
-#ifdef SCTP_PEER_ADDR_PARAMS
-	{ SCTP_PEER_ADDR_PARAMS,            "SCTP_PEER_ADDR_PARAMS"           },	
 #endif
 	{ SCTP_COOKIE_WAIT,                 "SCTP_COOKIE_WAIT"                },
 	{ SCTP_COOKIE_ECHOED,               "SCTP_COOKIE_ECHOED"              },