Minor fixes to BTree to pass deprecated and line length checks