Bug fixes on Checkout