Once again, more map fixes