Fix issues with regard to unloading channels