Fix store and product bugs