Fixed some map things