fixes to communication classes