Fix map issues.