Fix all product methods