Multiplex scanning fixes