jvillalobos More channel fixes