ProtocolChat fixes