Make channels resilient to restart