Changes to be compatible with Gnome 3.10