Iterators errors fixed