fixes in iterators