Improved graceful channel shutdown