further fixies to mutator