Updates for GDK changes in XE 16.