Minir changes to get libtree working.