Fixed cart bugs