Fix Halo build, take 2