VCF fixes