FileSystem sync + minor fix