Small fixes to Networking