Fix bugs on Channel