Fixes for GTK3 support