[server side] minor fixes