Fixes for products with options but no variants