Checkout Fixes