Fixed a couple of bugs in the channel selection.