Fixing cart bugs