Fixes for vQC issues.