fix some bug on server