VQC fixes for sprint 2 and 3