Improved GNOME support