MUL Mixture Boilerplate v2 fixes round 2