Vendor: Fix time issues