Fixing all problems