Fix all of the broken things!