diff --git a/cmd-choose-client.c b/cmd-choose-client.c
index 7c3b926a..75ef8f2c 100644
--- a/cmd-choose-client.c
+++ b/cmd-choose-client.c
@@ -44,7 +44,6 @@ const struct cmd_entry cmd_choose_client_entry = {
 
 struct cmd_choose_client_data {
 	struct client	*client;
-	char   		*template;
 };
 
 enum cmd_retval
diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c
index 4432ff7e..cf0b772a 100644
--- a/cmd-choose-tree.c
+++ b/cmd-choose-tree.c
@@ -219,6 +219,7 @@ windows_only:
 
 			free(final_win_action);
 		}
+
 		/*
 		 * If we're just drawing windows, don't consider moving on to
 		 * other sessions as we only list windows in this session.
@@ -260,5 +261,4 @@ cmd_choose_tree_free(struct window_choose_data *cdata)
 	free(cdata->command);
 	format_free(cdata->ft);
 	free(cdata);
-
 }
diff --git a/input.c b/input.c
index 0f4ddb48..bdd1936e 100644
--- a/input.c
+++ b/input.c
@@ -1565,10 +1565,11 @@ input_exit_osc(struct input_ctx *ictx)
 		server_status_window(ictx->wp->window);
 		break;
 	case 12:
-		screen_set_cursor_colour(ictx->ctx.s, p);
+		if (*p != '?') /* ? is colour request */
+			screen_set_cursor_colour(ictx->ctx.s, p);
 		break;
 	case 112:
-		if (*p == '\0') /* No arguments allowed. */
+		if (*p == '\0') /* no arguments allowed */
 			screen_set_cursor_colour(ictx->ctx.s, "");
 		break;
 	default: