Some map fixes