merge fixes of All-done-waiter and DEBUG in SPIKE_chat