Small updates to the client