Adjust to the new TargetMachine interface