Fixed bugs in Server class