Updated some iterators