More fixes to vendor paths