Improvements to checkout