mixer: refix what was broken by newer commits