Fix XCVB build.