Fix few bugs with recent cart changes.