[FIX] VCF demo and exercises fixed