diff --git a/popup.c b/popup.c
index 9937d586..4b47df2b 100644
--- a/popup.c
+++ b/popup.c
@@ -70,8 +70,10 @@ popup_set_client_cb(struct tty_ctx *ttyctx, struct client *c)
 {
 	struct popup_data	*pd = ttyctx->arg;
 
+	if (c != pd->c)
+		return (0);
 	if (pd->c->flags & CLIENT_REDRAWOVERLAY)
-		return (-1);
+		return (0);
 
 	ttyctx->bigger = 0;
 	ttyctx->wox = 0;
diff --git a/tmux.1 b/tmux.1
index 5b7bb3db..eafa3751 100644
--- a/tmux.1
+++ b/tmux.1
@@ -4553,7 +4553,7 @@ The following variables are available, where appropriate:
 .It Li "pane_marked" Ta "" Ta "1 if this is the marked pane"
 .It Li "pane_marked_set" Ta "" Ta "1 if a marked pane is set"
 .It Li "pane_mode" Ta "" Ta "Name of pane mode, if any"
-.It Li "pane_path" Ta "#T" Ta "Path of pane (can be set by application)"
+.It Li "pane_path" Ta "" Ta "Path of pane (can be set by application)"
 .It Li "pane_pid" Ta "" Ta "PID of first process in pane"
 .It Li "pane_pipe" Ta "" Ta "1 if pane is being piped"
 .It Li "pane_right" Ta "" Ta "Right of pane"
diff --git a/tty-keys.c b/tty-keys.c
index f5a3418f..dc064a17 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -1064,10 +1064,7 @@ tty_keys_device_attributes(struct tty *tty, const char *buf, size_t len,
 	/* Add terminal features. */
 	switch (p[0]) {
 	case 41: /* VT420 */
-		tty_add_features(&c->term_features,
-		    "margins,"
-		    "rectfill",
-		    ",");
+		tty_add_features(&c->term_features, "margins,rectfill", ",");
 		break;
 	case 'M': /* mintty */
 		tty_default_features(&c->term_features, "mintty", 0);