Changes to make WiFi work

Credit/Thanks to CM