Fix some likely problems caused by ClientServerProtocol
Actually use ClientServerProtocol