Some more Mixer unit support