Add FileOperations, and other fixes.