Fixing file names and paths