multiplexer fixes