Some fixes in Form_Products and Model_Products