Minor fixes to Server and Queue