diff --git a/screen-write.c b/screen-write.c
index 6bc2716d..5ef9ce46 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -576,7 +576,6 @@ screen_write_fast_copy(struct screen_write_ctx *ctx, struct screen *src,
 	if (nx == 0 || ny == 0)
 		return;
 
-	cy = s->cy;
 	for (yy = py; yy < py + ny; yy++) {
 		if (yy >= gd->hsize + gd->sy)
 			break;
diff --git a/server-client.c b/server-client.c
index b3af0314..0309a3b0 100644
--- a/server-client.c
+++ b/server-client.c
@@ -596,7 +596,6 @@ server_client_check_mouse_in_pane(struct window_pane *wp, u_int px, u_int py,
 	sb = options_get_number(wo, "pane-scrollbars");
 	sb_pos = options_get_number(wo, "pane-scrollbars-position");
 	pane_status = options_get_number(wo, "pane-border-status");
-	sb_pos = options_get_number(wo, "pane-scrollbars-position");
 
 	if (window_pane_show_scrollbar(wp, sb)) {
 		sb_w = wp->scrollbar_style.width;
@@ -655,10 +654,8 @@ server_client_check_mouse_in_pane(struct window_pane *wp, u_int px, u_int py,
 			    fwp->xoff + fwp->sx >= px))
 				break;
 		}
-		if (fwp != NULL) {
-			wp = fwp;
+		if (fwp != NULL)
 			return (BORDER);
-		}
 	}
 	return (NOWHERE);
 }
diff --git a/server-fn.c b/server-fn.c
index 06de6812..db7a870c 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -427,7 +427,7 @@ void
 server_destroy_session(struct session *s)
 {
 	struct client	*c;
-	struct session	*s_new = NULL, *cs_new, *use_s;
+	struct session	*s_new = NULL, *cs_new = NULL, *use_s;
 	int		 detach_on_destroy;
 
 	detach_on_destroy = options_get_number(s->options, "detach-on-destroy");
diff --git a/window-buffer.c b/window-buffer.c
index dfc65109..f4a6b44a 100644
--- a/window-buffer.c
+++ b/window-buffer.c
@@ -158,7 +158,7 @@ window_buffer_build(void *modedata, struct mode_tree_sort_criteria *sort_crit,
 	struct window_buffer_modedata	*data = modedata;
 	struct window_buffer_itemdata	*item;
 	u_int				 i;
-	struct paste_buffer		*pb;
+	struct paste_buffer		*pb = NULL;
 	char				*text, *cp;
 	struct format_tree		*ft;
 	struct session			*s = NULL;
@@ -171,7 +171,6 @@ window_buffer_build(void *modedata, struct mode_tree_sort_criteria *sort_crit,
 	data->item_list = NULL;
 	data->item_size = 0;
 
-	pb = NULL;
 	while ((pb = paste_walk(pb)) != NULL) {
 		item = window_buffer_add_item(data);
 		item->name = xstrdup(paste_buffer_name(pb));