Fix support for multiple VCS roots?