Fix dedup and dupnum conflicts in client.