fix-paths.diff