Channels fixes