Fixes in the CommunicationMgr