Fixed Server Bugs