changed clients to use per-connection xid
minor