more GTK3 build fixes