Adapt client to unicode