Get some things working again that I broke.