mecha fixes