More fixes to channel and pipeline