Fixed various issues with the Product controller