Bug fixes and Wifi/Bluetooth scans