Add back support for joining channels with keys