More minor fixes in the ServerCommunicationManager