Minor fixes to server.