Fix channel registration