Fixes for GTK2