Fixed cart issues