Fix bugs in product management