WiFi changes to match mako