A few improvements to the server