Wifi scanning fixes