Fixes for products without variants