Fixed some map issues