Fixed some more map issues