Fixes for the Checkout