Improve Channel closing