Fix VCS sync errors