Small changes to server comm.