diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
index bcc48e0c..a859d0bb 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -1,3 +1,10 @@
 #!/bin/bash
 PULSE_SCRIPT=/etc/xrdp/pulse/default.pa /startpulse.sh --start &
-/usr/bin/startxfce4 > /dev/null 2>&1
+setterm blank 0
+setterm powerdown 0
+if [ -f "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml ]; then
+  sed -i \
+    '/use_compositing/c <property name="use_compositing" type="bool" value="false"/>' \
+    "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+fi
+/usr/bin/dbus-launch /usr/bin/startxfce4 --replace > /dev/null 2>&1
diff --git a/root/usr/local/bin/wrapped-chromium b/root/usr/local/bin/wrapped-chromium
index 2e2431a8..9a93d06e 100755
--- a/root/usr/local/bin/wrapped-chromium
+++ b/root/usr/local/bin/wrapped-chromium
@@ -2,8 +2,13 @@
 
 BIN=/usr/bin/chromium
 
+# Cleanup
+if ! pgrep chromium > /dev/null;then
+  rm -f $HOME/.config/chromium/Singleton*
+fi
+
 # Run normally on privved containers or modified un non priv
-if grep -q 'Seccomp:	0' /proc/1/status; then
+if grep -q 'Seccomp:\t0' /proc/1/status; then
   ${BIN} --password-store=basic "$@"
 else
   ${BIN} --password-store=basic --no-sandbox --test-type "$@"