Fix some problems with carts