GTK3 migration - minor fixes