Fixing all the stuff