Some small changes to the channels, and one big fix that prevents incorrect early termination