Fix more iterators