Some communication improvements