fixes to work with GDK updates for XE12