Updated to XE16, misc cleanup