Fixed various compilation issues and tuned the new communicator changes
to work properly