MUL Mixture Boilerplaye v2 fixes