yet more network related fixes
13 files changed