Some fixes to BTreeNonLeaf