diff --git a/format.c b/format.c
index 4709e7a5..a21a3091 100644
--- a/format.c
+++ b/format.c
@@ -4447,6 +4447,9 @@ format_loop_sessions(struct format_expand_state *es, const char *fmt)
 		free(expanded);
 	}
 
+	free(active);
+	free(all);
+
 	return (value);
 }
 
@@ -5239,13 +5242,11 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
 done:
 	/* Expand again if required. */
 	if (modifiers & FORMAT_EXPAND) {
-		format_copy_state(&next, es, FORMAT_EXPAND_NOJOBS);
-		new = format_expand1(&next, value);
+		new = format_expand1(es, value);
 		free(value);
 		value = new;
 	} else if (modifiers & FORMAT_EXPANDTIME) {
-		format_copy_state(&next, es, FORMAT_EXPAND_TIME|
-		    FORMAT_EXPAND_NOJOBS);
+		format_copy_state(&next, es, FORMAT_EXPAND_TIME);
 		new = format_expand1(&next, value);
 		free(value);
 		value = new;
diff --git a/menu.c b/menu.c
index e4f79dec..0df6fb47 100644
--- a/menu.c
+++ b/menu.c
@@ -90,6 +90,7 @@ menu_add_item(struct menu *menu, const struct menu_item *item,
 	else
 		s = format_single(qitem, item->name, c, NULL, NULL, NULL);
 	if (*s == '\0') { /* no item if empty after format expanded */
+		free(s);
 		menu->count--;
 		return;
 	}
diff --git a/tmux.1 b/tmux.1
index 68892668..5f566243 100644
--- a/tmux.1
+++ b/tmux.1
@@ -2247,7 +2247,6 @@ Same as
 .Ic scroll-down
 but also exit copy mode if the cursor reaches the bottom.
 .It Xo
-.It Xo
 .Ic scroll-exit-on
 .Xc
 Turn on exiting copy mode when scrolling to the end of the buffer.
@@ -2259,6 +2258,7 @@ Turn off exiting copy mode when scrolling to the end of the buffer.
 .Ic scroll-exit-toggle
 .Xc
 Toggle exiting copy mode when scrolling to the end of the buffer.
+.It Xo
 .Ic scroll-middle
 (vi: z)
 .Xc