CheckoutState minor improvements