some fixes in communication