Fixes for Gtk 2