Fixed More Server Bugs