Fixed a few more bugs in the networking