VBF improvements