Better wifi turn on/off handling