some same-channel join fixes