Vendor: Updates from Serrano