Minor improvements to the mixer
Minor improvements