VCS keys fix