more BT fixes