Final tweaks to file system