Update due to rbtree API changes