BT Tweaks

Change-Id: Icd436a47dad52fe6812b11154f5778b5697f665f