Fixing all the broken things...