Fixing last VC changes