more bluetooth fixes