A couple of halo fixes