minor changes on server side