Fixed map errors