ForEachPoint + Unify fixes