Fix-up network mode choice