Fix other build errors for Halo