Fix vendorsetup for CM