Minor fixes to index arguments for do_task_eval