SCI: Tweak remapChannel call locations