Fix channel, etc.