Fixed applyDVF.xml, generateDVF.xml