Making some tweaks to the handling of joining and parting channels