Minor ServerComms Update

Gets ServerComms in sync with ws-proxy branch