Fixed map bugs.