Correct minor iterator issues.