Small updates to server and client.