Networking fixes, still not 100%