Fix BinaryTree skip, small otb changes