more cart checkout fixes