- Fixes to communicator