Fixes to Server/ServerThread