diff --git a/cmd-command-prompt.c b/cmd-command-prompt.c
index 3cc5b2fb..41bbe01d 100644
--- a/cmd-command-prompt.c
+++ b/cmd-command-prompt.c
@@ -192,7 +192,7 @@ cmd_command_prompt_callback(void *data, const char *s, int done)
 
 	if (!done)
 		free(new_template);
-	if (c->prompt_callbackfn != (void *)&cmd_command_prompt_callback)
+	if (c->prompt_callbackfn != cmd_command_prompt_callback)
 		return (1);
 	return (0);
 }
diff --git a/grid.c b/grid.c
index 43145eae..af555e6d 100644
--- a/grid.c
+++ b/grid.c
@@ -89,7 +89,7 @@ grid_need_extended_cell(const struct grid_cell_entry *gce,
 		return (1);
 	if (gc->data.size != 1 || gc->data.width != 1)
 		return (1);
-	if ((gc->fg & COLOUR_FLAG_RGB) ||(gc->bg & COLOUR_FLAG_RGB))
+	if ((gc->fg & COLOUR_FLAG_RGB) || (gc->bg & COLOUR_FLAG_RGB))
 		return (1);
 	return (0);
 }
diff --git a/tmux.c b/tmux.c
index d836aacf..b2768fa1 100644
--- a/tmux.c
+++ b/tmux.c
@@ -120,7 +120,7 @@ make_label(const char *label)
 	uid = getuid();
 
 	if ((s = getenv("TMUX_TMPDIR")) != NULL && *s != '\0')
-		xasprintf(&base, "%s/tmux-%u", s, uid);
+		xasprintf(&base, "%s/tmux-%ld", s, (long)uid);
 	else
 		xasprintf(&base, "%s/tmux-%ld", _PATH_TMP, (long)uid);