Fix echo cancel logic and add more explict logs.