diff --git a/regsub.c b/regsub.c
index 22e236dc..4039b9be 100644
--- a/regsub.c
+++ b/regsub.c
@@ -24,8 +24,7 @@
 #include "tmux.h"
 
 static void
-regsub_copy(char **buf, size_t *len, const char *text, size_t start,
-    size_t end)
+regsub_copy(char **buf, size_t *len, const char *text, size_t start, size_t end)
 {
 	size_t	add = end - start;
 
diff --git a/tmux.h b/tmux.h
index 9344dfe3..e66cbb39 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2469,7 +2469,6 @@ void	 screen_select_cell(struct screen *, struct grid_cell *,
 void	 screen_alternate_on(struct screen *, struct grid_cell *, int);
 void	 screen_alternate_off(struct screen *, struct grid_cell *, int);
 
-
 /* window.c */
 extern struct windows windows;
 extern struct window_pane_tree all_window_panes;
diff --git a/window-copy.c b/window-copy.c
index ca938fdd..668a1b50 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -4359,7 +4359,7 @@ window_copy_start_drag(struct client *c, struct mouse_event *m)
 		data->selflag = SEL_CHAR;
 	switch (data->selflag) {
 		case SEL_WORD:
-			if (data->ws) {
+			if (data->ws != NULL) {
 				window_copy_update_cursor(wme, x, y);
 				window_copy_cursor_previous_word_pos(wme,
 				    data->ws, 0, &x, &y);