More tweaks to checkout