Fix map issues