Some iterator fixes.