BT fixes round 2