Bluetooth fixes

Change-Id: Ie9abdee4d3ba341da1524bcc974db3b99266a3f7