channel fixes