Fixed up the tree-delegate stuff