Cross server communication fixes, additions