Minor changes to the server