Fixed some bugs in the server