Tweaks to client.