Couple more changes to the server code.