Changes to multi-machine logic.