Adjust machine_batch to new machine_options world