Fix map iterator deletion