Cart and Completeor fixes