Explicit channel close and fixed some end=true cases