Fix some of the strangeness with the mixer layout..