Bug fixes - channel links