Fix file scanner leak
Fix dir property and root build