Some edits in the client.