Closes issue #1347 and also fixes small typo bug in checkout.