Minor changes and FileCopy optimization.