Fixes for products.yaml