diff --git a/cmd-select-layout.c b/cmd-select-layout.c
index 3ca8766e..c5f64a07 100644
--- a/cmd-select-layout.c
+++ b/cmd-select-layout.c
@@ -87,13 +87,11 @@ cmd_select_layout_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args	*args = self->args;
 	struct winlink	*wl;
-	struct window	*w;
 	const char	*layoutname;
 	int		 next, previous, layout;
 
 	if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL)
 		return (CMD_RETURN_ERROR);
-	w = wl->window;
 
 	next = self->entry == &cmd_next_layout_entry;
 	if (args_has(self->args, 'n'))
diff --git a/server-client.c b/server-client.c
index b24b68e8..82189a5c 100644
--- a/server-client.c
+++ b/server-client.c
@@ -331,7 +331,7 @@ int
 server_client_assume_paste(struct session *s)
 {
 	struct timeval	tv;
-	u_int		t;
+	int		t;
 
 	if ((t = options_get_number(&s->options, "assume-paste-time")) == 0)
 		return (0);