FileSystem minor fixies