Minor updates to checkout process