kill-tree* fixes