Update vendors, fix mapping issues