Wifi and bluetooth fix - part 1