various map fixes