Minor ServerComms Update

Gets ServerComms in sync with xmlio branch