Various iteration fixes.