jcsullins BT fixes