diff --git a/VECTO/Input Files/VectoJob.vb b/VECTO/Input Files/VectoJob.vb
index 4e76eaa5643a210a5a559f5726de38a49b7b0232..125c3fcb77fd3b5f8f68742371f6c9f103466ce4 100644
--- a/VECTO/Input Files/VectoJob.vb	
+++ b/VECTO/Input Files/VectoJob.vb	
@@ -538,7 +538,7 @@ Public Class VectoJob
         If (vectoJob.JobType = VectoSimulationJobType.ConventionalVehicle OrElse vectoJob.JobType = VectoSimulationJobType.ParallelHybridVehicle) _
              AndAlso gearboxInputData Is Nothing Then _
             result.Add(New ValidationResult("Gearbox File is missing or invalid"))
-        If (mode = ExecutionMode.Engineering AndAlso vectoJob.JobType = VectoSimulationJobType.ConventionalVehicle OrElse vectoJob.JobType = VectoSimulationJobType.ParallelHybridVehicle) _
+        If (mode = ExecutionMode.Engineering AndAlso (vectoJob.JobType = VectoSimulationJobType.ConventionalVehicle OrElse vectoJob.JobType = VectoSimulationJobType.ParallelHybridVehicle)) _
              AndAlso gearshiftInputData Is Nothing Then _
             result.Add(New ValidationResult("Gearshift File is missing or invalid"))
 
diff --git a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
index 3388740f180396f93aec2c3ba1bbcc741ab6ddaf..78d2781eef43c103cea04f0cca10db36cd9703f5 100644
--- a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
+++ b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
@@ -788,7 +788,11 @@ public class JSONFileWriter : IOutputFileWriter
 			body.Add("TCU", GetRelativePath(input.DriverInputData.GearshiftInputData.Source, basePath));
 
 		}
-		body.Add("HybridStrategyParams", GetRelativePath(input.JobInputData.HybridStrategyParameters.Source, basePath));
+
+		if (!job.SavedInDeclarationMode) {
+			body.Add("HybridStrategyParams",
+				GetRelativePath(input.JobInputData.HybridStrategyParameters.Source, basePath));
+		}
 
 		var auxList = new List<object>();
 		if (job.SavedInDeclarationMode && job.Vehicle is IVehicleDeclarationInputData declVehicle) {
@@ -808,9 +812,9 @@ public class JSONFileWriter : IOutputFileWriter
 
 				auxList.Add(auxOut);
 			}
-			if (declVehicle.Components.BusAuxiliaries != null) {
-				body.Add("BusAux", GetRelativePath(job.Vehicle.Components.AuxiliaryInputData.BusAuxiliariesData.DataSource.SourceFile, basePath));
-			}
+			//if (declVehicle.Components.BusAuxiliaries != null) {
+			//	body.Add("BusAux", GetRelativePath(job.Vehicle.Components.AuxiliaryInputData.BusAuxiliariesData.DataSource.SourceFile, basePath));
+			//}
 			body.Add("Aux", auxList);
 		}