Product activity fixes