Fixes for XE16