Fix VCS mappings