Fix iterator methods