Fixing HALO stuff