Fixing messes