Properly handle joining channels