Networking Fixes

Ready for testing.