Fixes for vc