diff --git a/po/POTFILES.in b/po/POTFILES.in
index fb893350e..57351193c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -21,9 +21,9 @@ src/core/util.c
 src/core/window.c
 src/core/window-props.c
 src/core/xprops.c
-src/mutter.desktop.in
-src/mutter-wm.desktop.in
+src/mutter-wayland.desktop.in
 src/org.gnome.mutter.gschema.xml.in
+src/org.gnome.mutter.wayland.gschema.xml.in
 src/ui/frames.c
 src/ui/menu.c
 src/ui/metaaccellabel.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 1c6195d37..2d98d97f8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -336,6 +336,7 @@ CLEANFILES =					\
 	mutter-wayland.desktop			\
 	mutter-wm.desktop			\
 	org.gnome.mutter.gschema.xml		\
+	org.gnome.mutter.wayland.gschema.xml	\
 	$(xml_DATA)				\
 	$(mutter_built_sources)			\
 	$(typelib_DATA)				\
@@ -352,10 +353,12 @@ EXTRA_DIST=$(desktopfiles_files) 	\
 	$(wmproperties_in_files)	\
 	$(xml_in_files)			\
 	org.gnome.mutter.gschema.xml.in \
+	org.gnome.mutter.wayland.gschema.xml.in \
 	mutter-schemas.convert \
 	libmutter-wayland.pc.in \
 	mutter-enum-types.h.in \
-	mutter-enum-types.c.in
+	mutter-enum-types.c.in \
+	xrandr.xml idle-monitor.xml
 
 BUILT_SOURCES = $(mutter_built_sources)
 MUTTER_STAMP_FILES = stamp-mutter-enum-types.h
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index 866089861..09393d251 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -694,7 +694,7 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
   MetaCompScreen *info;
   MetaDisplay    *display       = meta_screen_get_display (screen);
   Display        *xdisplay      = meta_display_get_xdisplay (display);
-  Window          xwin;
+  Window          xwin = None;
   gint            width, height;
   MetaWaylandCompositor *wayland_compositor;
 
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index b967b571d..6e7f4bfb7 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -451,12 +451,7 @@ meta_window_actor_dispose (GObject *object)
   info     = meta_screen_get_compositor_data (screen);
 
   if (!meta_is_wayland_compositor ())
-    {
-      display  = meta_screen_get_display (screen);
-      xdisplay = meta_display_get_xdisplay (display);
-
-      meta_window_actor_detach_x11_pixmap (self);
-    }
+    meta_window_actor_detach_x11_pixmap (self);
 
   if (priv->send_frame_messages_timer != 0)
     {
@@ -477,6 +472,9 @@ meta_window_actor_dispose (GObject *object)
 
   if (!meta_is_wayland_compositor () && priv->damage != None)
     {
+      display  = meta_screen_get_display (screen);
+      xdisplay = meta_display_get_xdisplay (display);
+
       meta_error_trap_push (display);
       XDamageDestroy (xdisplay, priv->damage);
       meta_error_trap_pop (display);
diff --git a/src/core/stack-tracker.c b/src/core/stack-tracker.c
index fb26b6b21..63044a2d8 100644
--- a/src/core/stack-tracker.c
+++ b/src/core/stack-tracker.c
@@ -1051,7 +1051,6 @@ stack_tracker_event_received (MetaStackTracker *tracker,
 
   tracker->xserver_serial = op->any.serial;
 
-#warning "TODO: remove unused tracker->xserver_stack"
   /* XXX: With the design we have ended up with it looks like we've
    * ended up making it unnecessary to maintain tracker->xserver_stack
    * since we only need an xserver_stack during the