diff --git a/cmd-choose-client.c b/cmd-choose-client.c
index 299fa3af..1f9741fe 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/input.c b/input.c
index 7d26a661..e04ddc4f 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: