Fixes for compatibility with Ubuntu Gnome-Shell