bt fixes

Change-Id: Id71ad82b958606a7adad8110b98fb0958b528976