more bt tweaks

Change-Id: I4cd5578b7444a81798b7b202dcaab0d1a778c4c4