Fixed some map bounding issues