More iterator fix