More bluetooth changes