Put temporary file in source directory
More review changes.