diff --git a/emmet-builders/emmet/builders/settings.py b/emmet-builders/emmet/builders/settings.py
index f14836f7be..3b68c12a56 100644
--- a/emmet-builders/emmet/builders/settings.py
+++ b/emmet-builders/emmet/builders/settings.py
@@ -2,6 +2,7 @@
 import importlib
 from pydantic import Field, validator
 from emmet.core.settings import EmmetSettings
+from emmet.core.vasp.calc_types import RunType
 
 
 class EmmetBuilderSettings(EmmetSettings):
diff --git a/emmet-builders/emmet/builders/vasp/materials.py b/emmet-builders/emmet/builders/vasp/materials.py
index 74e2ccad3b..2cde2643af 100644
--- a/emmet-builders/emmet/builders/vasp/materials.py
+++ b/emmet-builders/emmet/builders/vasp/materials.py
@@ -397,7 +397,7 @@ def _structure_eval(task: Dict):
         entries = {}
         all_run_types = set(run_types.keys())
         for rt in all_run_types:
-            rt_tasks = {t_id for t_id in tasks if run_types[t_id] == rt}
+            rt_tasks = {t_id for t_id in task_ids if run_types[t_id] == rt}
             relevant_calcs = [
                 doc for doc in structure_calcs if doc[self.tasks.key] in rt_tasks
             ]
diff --git a/emmet-core/emmet/core/vasp/material.py b/emmet-core/emmet/core/vasp/material.py
index 4073ad42a6..68c87cd2de 100644
--- a/emmet-core/emmet/core/vasp/material.py
+++ b/emmet-core/emmet/core/vasp/material.py
@@ -9,7 +9,7 @@
 from emmet.core.material import PropertyOrigin as CorePropertyOrigin
 from emmet.core.structure import StructureMetadata
 from emmet.core.vasp.calc_types import CalcType, RunType, TaskType
-from emmet.stubs import Structure
+from emmet.stubs import Structure, ComputedEntry
 
 
 class PropertyOrigin(CorePropertyOrigin):