Some changes to server.c.