Fix vendor inheritance