Minor "mecha block" fixes.