diff --git a/cmd-find-window.c b/cmd-find-window.c
index 1a08c18b..9a0a8a42 100644
--- a/cmd-find-window.c
+++ b/cmd-find-window.c
@@ -193,6 +193,7 @@ cmd_find_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 		    ARRAY_ITEM(&find_list, i).list_ctx);
 		format_session(cdata->ft, s);
 		format_winlink(cdata->ft, s, wm);
+		format_window_pane(cdata->ft, wm->window->active);
 
 		window_choose_add(wl->window->active, cdata);
 	}
diff --git a/cmd-list-windows.c b/cmd-list-windows.c
index 3be8ade8..b36b5ee8 100644
--- a/cmd-list-windows.c
+++ b/cmd-list-windows.c
@@ -99,6 +99,7 @@ cmd_list_windows_session(
 		format_add(ft, "line", "%u", n);
 		format_session(ft, s);
 		format_winlink(ft, s, wl);
+		format_window_pane(ft, wl->window->active);
 
 		line = format_expand(ft, template);
 		ctx->print(ctx, "%s", line);
diff --git a/server-window.c b/server-window.c
index 72203201..fce6439b 100644
--- a/server-window.c
+++ b/server-window.c
@@ -75,12 +75,14 @@ server_window_check_bell(struct session *s, struct winlink *wl)
 	if (s->curw != wl || s->flags & SESSION_UNATTACHED)
 		wl->flags |= WINLINK_BELL;
 	if (s->flags & SESSION_UNATTACHED)
-		return (1);
+		return (0);
 	if (s->curw->window == wl->window)
 		w->flags &= ~WINDOW_BELL;
 
 	visual = options_get_number(&s->options, "visual-bell");
 	action = options_get_number(&s->options, "bell-action");
+	if (action == BELL_NONE)
+		return (0);
 	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
 		c = ARRAY_ITEM(&clients, i);
 		if (c == NULL || c->session != s)
diff --git a/tmux.1 b/tmux.1
index aec62478..213db74f 100644
--- a/tmux.1
+++ b/tmux.1
@@ -2043,7 +2043,7 @@ window of that session,
 .Ic none
 means all bells are ignored and
 .Ic current
-means only bell in windows other than the current window are ignored.
+means only bells in windows other than the current window are ignored.
 .It Xo Ic bell-on-alert
 .Op Ic on | off
 .Xc
diff --git a/window.c b/window.c
index 5ef81959..6ec51c30 100644
--- a/window.c
+++ b/window.c
@@ -1203,7 +1203,7 @@ winlink_clear_flags(struct winlink *wl)
 void
 window_mode_attrs(struct grid_cell *gc, struct options *oo)
 {
-	memcpy(gc, &grid_default_cell, sizeof gc);
+	memcpy(gc, &grid_default_cell, sizeof *gc);
 	colour_set_fg(gc, options_get_number(oo, "mode-fg"));
 	colour_set_bg(gc, options_get_number(oo, "mode-bg"));
 	gc->attr |= options_get_number(oo, "mode-attr");