Just some small changes for the server side.