Multiplex fixes