Small rework ofwifi/bluetooth scanning