Fixed bugs in channel from last commit.