Fixing all sorts of stuff