Fixing all the stuff that broke