simple_fixes.diff