Changes to build on XenonHD