Fix channel joins