Some more map fixes