diff --git a/clients/simple-client.c b/clients/simple-client.c
index 89718dfa..a64a482f 100644
--- a/clients/simple-client.c
+++ b/clients/simple-client.c
@@ -96,6 +96,7 @@ init_egl(struct display *display)
 		EGL_RED_SIZE, 1,
 		EGL_GREEN_SIZE, 1,
 		EGL_BLUE_SIZE, 1,
+		EGL_ALPHA_SIZE, 1,
 		EGL_DEPTH_SIZE, 1,
 		EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
 		EGL_NONE
diff --git a/compositor/compositor.c b/compositor/compositor.c
index 23465dab..01fb2573 100644
--- a/compositor/compositor.c
+++ b/compositor/compositor.c
@@ -1327,9 +1327,11 @@ wlsc_output_move(struct wlsc_output *output, int x, int y)
 	output->x = x;
 	output->y = y;
 
-	output->background->x = x;
-	output->background->y = y;
-	wlsc_surface_update_matrix(output->background);
+	if (output->background) {
+		output->background->x = x;
+		output->background->y = y;
+		wlsc_surface_update_matrix(output->background);
+	}
 
 	pixman_region32_init(&output->previous_damage_region);