Final XenoArch Fixes (maybe)