Changes to some iterators