Fix machine_batch stop/delete