Fix 'vendor' checks (adjusted for webscalesql