Fixing some issues with the Vendor Products mappings