A couple of fix-ups on the purchase flow