Some iterators corrections (part 1)