Checkout messaging fix