Minor changes in file-export