fixes to file system scanning