diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index a8a39b6ddd0ca481ba7fe3350a30539178b939eb..4c3df1d49729890630000eff047ae11e81d06d5f 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -566,10 +566,12 @@ Public Class VectoJobForm
 
         '-------------------------------------------------------------
 
-        cbGearshiftStrategy.DataSource = PowertrainBuilder.GetRegisteredShiftStrategies(inputData.JobInputData.Vehicle.Components.GearboxInputData.Type).Select(Function(entry) New With {.Value = entry.Item1, .Label = entry.Item2}).ToList()
+        cbGearshiftStrategy.DataSource = PowertrainBuilder.GetRegisteredShiftStrategies(inputData.JobInputData.Vehicle.Components.GearboxInputData.Type) _
+            .Concat({ Tuple.Create("", "Not specified - use default")}) _
+            .Select(Function(entry) New With {.Value = entry.Item1, .Label = entry.Item2}).ToList()
         cbGearshiftStrategy.DisplayMember = "Label"
         cbGearshiftStrategy.ValueMember = "Value"
-        if (inputData.JobInputData.ShiftStrategy <> Nothing) then
+        if (not inputData.JobInputData.ShiftStrategy is Nothing) then
             cbGearshiftStrategy.SelectedValue = inputData.JobInputData.ShiftStrategy
         end if
 
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index 8be89afba30bbd6c851a030ed80082907df22645..8e19de132b3960145e6c5dc1a0a68b04647ed5fc 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -702,7 +702,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 		public JSONInputDataV4(JObject data, string filename, bool tolerateMissing = false)
 			: base(data, filename, tolerateMissing) { }
 
-		public override IGearshiftEngineeringInputData GearshiftInputData { get { return Body["TCU"] == null ? null : JSONInputDataFactory.ReadShiftParameters(Path.Combine(BasePath, Body.GetEx<string>("TCU")), false); } }
+		public override IGearshiftEngineeringInputData GearshiftInputData { get {
+			return Body["TCU"] == null
+				? null
+				: JSONInputDataFactory.ReadShiftParameters(Path.Combine(BasePath, Body.GetEx<string>("TCU")), false);
+		} }
 	}
 
 	public class JSONVTPInputDataV4 : JSONFile, IVTPEngineeringInputDataProvider, IVTPEngineeringJobInputData,
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 834a496cd57b1d62628fb5644cdc9bd3e2113bda..5d53da9484efdf9488e4e65980ea791e52da370c 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -740,9 +740,6 @@
     <EmbeddedResource Include="Resources\Declaration\ADAS\ADAS_Combinations.csv" />
     <EmbeddedResource Include="Resources\XSD\VectoDeclarationDefinitions.2.3_DEV.xsd">
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\XSD\VectoDeclarationDefinitions.2.5_Gearbox.xsd">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <None Include="Utils\VectoVersionCore.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>VectoVersionCore.cs</LastGenOutput>