Some minor changes to server.