fixes for Gtk 3.10 upgrade