Fixes to the Communicator and logging extra data