Fixes on ServerCommunicationHandler