diff --git a/cmd-kill-session.c b/cmd-kill-session.c
index 22c37b2c..4bf36d78 100644
--- a/cmd-kill-session.c
+++ b/cmd-kill-session.c
@@ -18,6 +18,8 @@
 
 #include <sys/types.h>
 
+#include <stdlib.h>
+
 #include "tmux.h"
 
 /*
diff --git a/cmd-kill-window.c b/cmd-kill-window.c
index 4353c1c1..0253605f 100644
--- a/cmd-kill-window.c
+++ b/cmd-kill-window.c
@@ -18,6 +18,8 @@
 
 #include <sys/types.h>
 
+#include <stdlib.h>
+
 #include "tmux.h"
 
 /*
diff --git a/cmd-server-access.c b/cmd-server-access.c
index 4ec61af3..895e6941 100644
--- a/cmd-server-access.c
+++ b/cmd-server-access.c
@@ -63,7 +63,7 @@ cmd_server_access_exec(struct cmd *self, struct cmdq_item *item)
 	struct args	*args = cmd_get_args(self);
 	struct client	*c = cmdq_get_target_client(item);
 	char		*arg;
-	const char	*name, *type = NULL;
+	const char	*name = NULL, *type;
 	struct passwd	*pw;
 	struct group	*gr;
 	id_t		 id;
@@ -80,20 +80,20 @@ cmd_server_access_exec(struct cmd *self, struct cmdq_item *item)
 
 	arg = format_single(item, args_string(args, 0), c, NULL, NULL, NULL);
 	if (args_has(args, 'g')) {
+		type = "group";
 		if ((gr = getgrnam(arg)) != NULL) {
-			type = "group";
 			id = gr->gr_gid;
 			name = gr->gr_name;
 			flags |= SERVER_ACL_IS_GROUP;
 		}
 	} else {
+		type = "user";
 		if ((pw = getpwnam(arg)) != NULL) {
-			type = "user";
 			id = pw->pw_uid;
 			name = pw->pw_name;
 		}
 	}
-	if (type == NULL) {
+	if (name == NULL) {
 		cmdq_error(item, "unknown %s: %s", type, arg);
 		free(arg);
 		return (CMD_RETURN_ERROR);
diff --git a/tmux.1 b/tmux.1
index 1b617671..9a0fdf25 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3132,7 +3132,7 @@ Destroy the given pane.
 If no panes remain in the containing window, it is also destroyed.
 The
 .Fl a
-option kills all but the pane given with
+option kills all panes in the window except the pane given with
 .Fl t .
 When
 .Fl a
@@ -3152,7 +3152,7 @@ Kill the current window or the window at
 removing it from any sessions to which it is linked.
 The
 .Fl a
-option kills all but the window given with
+option kills all windows in the session except the window given with
 .Fl t .
 When
 .Fl a