More halo fixes