Minor tweaks to Client interaction.