diff --git a/sway/commands/output.c b/sway/commands/output.c
index a7d325ecf..bc12310ed 100644
--- a/sway/commands/output.c
+++ b/sway/commands/output.c
@@ -35,6 +35,9 @@ struct cmd_results *cmd_output(int argc, char **argv) {
 	config->handler_context.output_config = output;
 
 	while (argc > 0) {
+		config->handler_context.leftovers.argc = 0;
+		config->handler_context.leftovers.argv = NULL;
+
 		if (find_handler(*argv, output_handlers, sizeof(output_handlers))) {
 			error = config_subcommand(argv, argc, output_handlers,
 					sizeof(output_handlers));
diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c
index f039c9c97..0c5c164ff 100644
--- a/sway/commands/output/background.c
+++ b/sway/commands/output/background.c
@@ -8,7 +8,7 @@
 #include "log.h"
 #include "stringop.h"
 
-static char *bg_options[] = {
+static const char *bg_options[] = {
 	"stretch",
 	"center",
 	"fill",