Communication fix and logging