Fix task set creation and execution updates