BST bug fixes and enhancements