Fixed map iterator problems.