diff --git a/cmd-if-shell.c b/cmd-if-shell.c
index 81518939..f0c3637c 100644
--- a/cmd-if-shell.c
+++ b/cmd-if-shell.c
@@ -124,7 +124,7 @@ cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item)
 	    -1) == NULL) {
 		cmdq_error(item, "failed to run command: %s", shellcmd);
 		free(shellcmd);
-		free(cdata);
+		cmd_if_shell_free(cdata);
 		return (CMD_RETURN_ERROR);
 	}
 	free(shellcmd);
diff --git a/tmux.1 b/tmux.1
index e3b18204..fec196ec 100644
--- a/tmux.1
+++ b/tmux.1
@@ -6941,8 +6941,8 @@ forwards any input read from stdin to the empty pane given by
 .Op Fl d Ar start-directory
 .Op Fl e Ar environment
 .Op Fl h Ar height
-.Op Fl s Ar border-style
-.Op Fl S Ar style
+.Op Fl s Ar style
+.Op Fl S Ar border-style
 .Op Fl t Ar target-pane
 .Op Fl T Ar title
 .Op Fl w Ar width