Various iterator fixes