Fixing all the things