Fixed some thing for the server