more communication bug fixes