diff --git a/kalpaa/stages/stage01.py b/kalpaa/stages/stage01.py
index c68aa6b..36c9b18 100644
--- a/kalpaa/stages/stage01.py
+++ b/kalpaa/stages/stage01.py
@@ -201,9 +201,7 @@ class Stage01Runner:
 	def run(self):
 		seed_index = 0
 		if self.config.generation_config.override_measurement_filesets is not None:
-			for (
-				override_name,
-			) in self.config.generation_config.override_measurement_filesets.keys():
+			for override_name in self.config.generation_config.override_measurement_filesets.keys():
 				# don't need to do anything with the files, just create the out dir
 				out = self.config.get_out_dir_path()
 				directory = out / f"{override_name}"
diff --git a/kalpaa/stages/stage02.py b/kalpaa/stages/stage02.py
index 8ce2dc0..f7d9f0d 100644
--- a/kalpaa/stages/stage02.py
+++ b/kalpaa/stages/stage02.py
@@ -115,7 +115,7 @@ class Stage02Runner:
 						_logger.info(f"Working on {trial_name=}")
 						_logger.debug(f"Have {seed_index=}")
 						self.single_run_in_subdir(
-							job_index, cost, dot.label, trial_name, seed_index
+							job_index, cost, dot.label, trial_name, seed_index, override_name=override_key
 						)
 
 	def single_run_in_subdir(
@@ -147,7 +147,7 @@ class Stage02Runner:
 					"override_name provided but no override_measurement_filesets, shouldn't be possible to get here"
 				)
 			_logger.info(f"Time to read override measurement fileset {override_name}")
-			override_dir = self.config.get_override_dir_path()
+			override_dir = self.config.get_override_dir_path() / override_name
 			override_measurements = (
 				self.config.generation_config.override_measurement_filesets[
 					override_name