Fixed some more issues with server communication.