fixes to communication