Added ubuntu & gnome-shell workarounds