Fix VendorSetup