CS-5: Product management bug fixes