Fix iterators.