file-tree fixes