Gtk3: More fixes