Fix up channel facades