Tweak client/server.

Tweak client/server so echo works correctly.