diff --git a/cmd-refresh-client.c b/cmd-refresh-client.c
index 2ade072f..22efb38b 100644
--- a/cmd-refresh-client.c
+++ b/cmd-refresh-client.c
@@ -117,7 +117,7 @@ cmd_refresh_client_exec(struct cmd *self, struct cmdq_item *item)
 	struct client		*tc = cmdq_get_target_client(item);
 	struct tty		*tty = &tc->tty;
 	struct window		*w;
-	const char		*size, *errstr, *value;
+	const char		*size, *errstr;
 	u_int			 x, y, adjust;
 	struct args_value	*av;
 
@@ -187,7 +187,7 @@ cmd_refresh_client_exec(struct cmd *self, struct cmdq_item *item)
 		av = args_first_value(args, 'A');
 		while (av != NULL) {
 			cmd_refresh_client_update_offset(tc, av->value);
-			av = args_next_value(&av);
+			av = args_next_value(av);
 		}
 		return (CMD_RETURN_NORMAL);
 	}
@@ -196,7 +196,7 @@ cmd_refresh_client_exec(struct cmd *self, struct cmdq_item *item)
 			goto not_control_client;
 		av = args_first_value(args, 'B');
 		while (av != NULL) {
-			cmd_refresh_client_update_subscription(tc, av);
+			cmd_refresh_client_update_subscription(tc, av->value);
 			av = args_next_value(av);
 		}
 		return (CMD_RETURN_NORMAL);
diff --git a/cmd.c b/cmd.c
index 90fa221a..a26c523b 100644
--- a/cmd.c
+++ b/cmd.c
@@ -252,7 +252,7 @@ cmd_log_argv(int argc, char **argv, const char *fmt, ...)
 
 /* Prepend to an argument vector. */
 void
-cmd_prepend_argv(int *argc, char ***argv, char *arg)
+cmd_prepend_argv(int *argc, char ***argv, const char *arg)
 {
 	char	**new_argv;
 	int	  i;
@@ -269,7 +269,7 @@ cmd_prepend_argv(int *argc, char ***argv, char *arg)
 
 /* Append to an argument vector. */
 void
-cmd_append_argv(int *argc, char ***argv, char *arg)
+cmd_append_argv(int *argc, char ***argv, const char *arg)
 {
 	*argv = xreallocarray(*argv, (*argc) + 1, sizeof **argv);
 	(*argv)[(*argc)++] = xstrdup(arg);
diff --git a/tmux.h b/tmux.h
index 63ad9e86..ae0ffc24 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2236,8 +2236,8 @@ int		 cmd_find_from_nothing(struct cmd_find_state *, int);
 /* cmd.c */
 extern const struct cmd_entry *cmd_table[];
 void printflike(3, 4) cmd_log_argv(int, char **, const char *, ...);
-void		 cmd_prepend_argv(int *, char ***, char *);
-void		 cmd_append_argv(int *, char ***, char *);
+void		 cmd_prepend_argv(int *, char ***, const char *);
+void		 cmd_append_argv(int *, char ***, const char *);
 int		 cmd_pack_argv(int, char **, char *, size_t);
 int		 cmd_unpack_argv(char *, size_t, int, char ***);
 char	       **cmd_copy_argv(int, char **);