Small fixes to communication form