minor changes in server code