fs_tree fixes