Fix several issues with the product-api