Some changes to the server