Fixing what needs to be fixed.