Fixes from git to build on GNOME 3.8