Wifi fixes