BT fixes after refactoring