Vendor tweaks and fixes