Fixing all the things!