data-client: couple copy tweaks