Small changes to server.