Merge "Fix Vts errors"