[IMP] product: fixes for review