diff --git a/data/phosh.in b/data/phosh.in
index b0f47f2ad60ab47d49881a6929999d5803378d3c..f3d104dc5f9cd594739b2c9a4a794836459cd40d 100755
--- a/data/phosh.in
+++ b/data/phosh.in
@@ -15,4 +15,6 @@ if [ -f "/etc/phosh/rootston.ini" ]; then
   ROOTSTON_INI=/etc/phosh/rootston.ini
 fi
 
-exec "${ROOTSTON}" -C "${ROOTSTON_INI}" -E "gnome-session --disable-acceleration-check --session=phosh"
+# Run gnome-session through a login shell so it picks
+# variables from /etc/profile.d (XDG_*)
+exec "${ROOTSTON}" -C "${ROOTSTON_INI}" -E "bash -lc 'gnome-session --disable-acceleration-check --session=phosh'"
diff --git a/data/rootston.ini b/data/rootston.ini
index 3d07964d72bc1772aa38ab00024a92bb4bc20f54..702cff78b908ff57e54232bba35aac4164577c0d 100644
--- a/data/rootston.ini
+++ b/data/rootston.ini
@@ -1,5 +1,5 @@
-[core]
-xwayland=false
+#[core]
+#xwayland=false
 
 [cursor:seat0]
 map-to-output:HDMI-A-1
diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c
index 796c0bf2291ed894a317c88f01030ff2835d4c7c..62aa6e53a17c60b7412387956c3622259a900e3e 100644
--- a/src/monitor/monitor.c
+++ b/src/monitor/monitor.c
@@ -100,10 +100,10 @@ output_handle_mode (void             *data,
   if (height > self->height)
     self->height = height;
 
-  if ((flags & WL_OUTPUT_MODE_CURRENT) == 1)
+  if (flags & WL_OUTPUT_MODE_CURRENT)
     self->current_mode = self->modes->len - 1;
 
-  if ((flags & WL_OUTPUT_MODE_PREFERRED) == 1)
+  if (flags & WL_OUTPUT_MODE_PREFERRED)
     self->preferred_mode = self->modes->len - 1;
 }