Fixing the file system construction.