some more Gtk 3.11+ fixes