More fixes for map iterator