Fix map errors