GTK3 build fixes