Small map fixes