Fix up everything added since I messed up the checkout.