Fixed bugs in products