Fixed some map bugs