Fixup for SD #2, rework WiFi a bit more