NV: fixes
Vendor: added some vendor dependencies