Improve 2-pass VBV