More changes to the server code.