More cart fixes