Fixup "split protocol into client and server part"