diff --git a/include/sway/config.h b/include/sway/config.h
index 4dd8e94c5..139d7800e 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -6,7 +6,6 @@
 #include <libinput.h>
 #include <stdint.h>
 #include <string.h>
-#include <wayland-server.h>
 #include <wlr/types/wlr_box.h>
 #include <xkbcommon/xkbcommon.h>
 #include <time.h>
diff --git a/sway/commands/output.c b/sway/commands/output.c
index be78358a6..23792855c 100644
--- a/sway/commands/output.c
+++ b/sway/commands/output.c
@@ -29,7 +29,8 @@ struct cmd_results *cmd_output(int argc, char **argv) {
 
 	struct output_config *output = new_output_config();
 	if (!output) {
-		return cmd_results_new(CMD_FAILURE, "output", "Unable to allocate output config");
+		sway_log(L_ERROR, "Failed to allocate output config");
+		return NULL;
 	}
 	output->name = strdup(name);
 
diff --git a/sway/config/output.c b/sway/config/output.c
index ed47a617c..6371763f8 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -131,12 +131,6 @@ void apply_output_config(struct output_config *oc, swayc_t *output) {
 		wlr_output_layout_add_auto(root_container.sway_root->output_layout,
 			wlr_output);
 	}
-	struct wlr_box *output_layout_box = wlr_output_layout_get_box(
-		root_container.sway_root->output_layout, wlr_output);
-	output->x = output_layout_box->x;
-	output->y = output_layout_box->y;
-	output->width = output_layout_box->width;
-	output->height = output_layout_box->height;
 
 	if (!oc || !oc->background) {
 		// Look for a * config for background
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index bcdaa7d2f..3fd49846b 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -91,19 +91,30 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
 	soutput->last_frame = now;
 }
 
+static void output_update_size(struct sway_output *output) {
+	struct wlr_box *output_layout_box = wlr_output_layout_get_box(
+		root_container.sway_root->output_layout, output->wlr_output);
+	output->swayc->x = output_layout_box->x;
+	output->swayc->y = output_layout_box->y;
+	output->swayc->width = output_layout_box->width;
+	output->swayc->height = output_layout_box->height;
+
+	arrange_windows(output->swayc, -1, -1);
+}
+
 static void output_resolution_notify(struct wl_listener *listener, void *data) {
-	struct sway_output *soutput = wl_container_of(listener, soutput, resolution);
-	arrange_windows(soutput->swayc, -1, -1);
+	struct sway_output *output = wl_container_of(listener, output, resolution);
+	output_update_size(output);
 }
 
 static void output_scale_notify(struct wl_listener *listener, void *data) {
-	struct sway_output *soutput = wl_container_of(listener, soutput, scale);
-	arrange_windows(soutput->swayc, -1, -1);
+	struct sway_output *output = wl_container_of(listener, output, scale);
+	output_update_size(output);
 }
 
 static void output_transform_notify(struct wl_listener *listener, void *data) {
-	struct sway_output *soutput = wl_container_of(listener, soutput, transform);
-	arrange_windows(soutput->swayc, -1, -1);
+	struct sway_output *output = wl_container_of(listener, output, transform);
+	output_update_size(output);
 }
 
 void output_add_notify(struct wl_listener *listener, void *data) {