Update to run on XE17