VC Fixes

Signed-off-by: https://github.com/Infinity-420 <iceis2@hotmail.com>
Merge branch 'master' into PB_Testing