Update and logic fixes to the plugin channel API