Improve handling of link_channel