Fix bugs related to interfaces and vcs