some minor changes in server code