Minor fixes to channels lookup.