BT fixes round 1
BT fixes round 2
BT fixes round 3
BT fixes round 4