Bluetooth fixes (forgotten commit + trivial fixes)

This adds a commit that should have been on the last series. And a couple of simple fixes.