Fixed map bugs