More fixes to the file system.