Changes to multiplexor handling