more RevTreeBuilder fixes