changes needed to track Gtk master