diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/message_instance.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/message_instance.py
index fd454fd6..2559a635 100644
--- a/spiffworkflow-backend/src/spiffworkflow_backend/models/message_instance.py
+++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/message_instance.py
@@ -59,7 +59,7 @@ class MessageInstanceModel(SpiffworkflowBaseDBModel):
     updated_at_in_seconds: int = db.Column(db.Integer)
     created_at_in_seconds: int = db.Column(db.Integer)
 
-    message_correlations: dict | None = None
+    message_correlations: Optional[dict] = None
 
     @validates("message_type")
     def validate_message_type(self, key: str, value: Any) -> Any:
diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/file_system_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/file_system_service.py
index 15327400..36570ade 100644
--- a/spiffworkflow-backend/src/spiffworkflow_backend/services/file_system_service.py
+++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/file_system_service.py
@@ -60,8 +60,9 @@ class FileSystemService:
     @staticmethod
     def workflow_path(spec: ProcessModelInfo) -> str:
         """Workflow_path."""
-        process_model_path = os.path.join(FileSystemService.root_path(), spec.id)
-        # process_group_path = FileSystemService.process_group_path_for_spec(spec)
+        process_model_path = os.path.join(
+            FileSystemService.root_path(), spec.id_for_file_path()
+        )
         return process_model_path
 
     @staticmethod