Fixes suggested by Bertrand. ExtraChannels not yet removed