diff --git a/Moose Development/Moose/Core/Point.lua b/Moose Development/Moose/Core/Point.lua
index b17e40f27..fcf67ca02 100644
--- a/Moose Development/Moose/Core/Point.lua	
+++ b/Moose Development/Moose/Core/Point.lua	
@@ -1637,6 +1637,7 @@ do -- COORDINATE
       if AirbaseCategory == Airbase.Category.SHIP or AirbaseCategory == Airbase.Category.HELIPAD then
         RoutePoint.linkUnit = AirbaseID
         RoutePoint.helipadId = AirbaseID
+        RoutePoint.airdromeId = airbase:IsAirdrome() and AirbaseID or nil
       elseif AirbaseCategory == Airbase.Category.AIRDROME then
         RoutePoint.airdromeId = AirbaseID
       else
diff --git a/Moose Development/Moose/Functional/Scoring.lua b/Moose Development/Moose/Functional/Scoring.lua
index 2c49243f8..d9427d279 100644
--- a/Moose Development/Moose/Functional/Scoring.lua	
+++ b/Moose Development/Moose/Functional/Scoring.lua	
@@ -320,8 +320,8 @@ function SCORING:New( GameName, SavePath, AutoSave )
 
   -- Create the CSV file.
   self.AutoSavePath = SavePath
-  self.AutoSave = AutoSave or true
-  if self.AutoSave == true then
+  self.AutoSave = (AutoSave == nil or AutoSave == true) and true or false
+  if self.AutoSavePath and self.AutoSave == true then
     self:OpenCSV( GameName )
   end
 
diff --git a/Moose Development/Moose/Utilities/Utils.lua b/Moose Development/Moose/Utilities/Utils.lua
index bd4f4390d..fa4ba7233 100644
--- a/Moose Development/Moose/Utilities/Utils.lua	
+++ b/Moose Development/Moose/Utilities/Utils.lua	
@@ -4281,20 +4281,10 @@ function UTILS.SpawnFARPAndFunctionalStatics(Name,Coordinate,FARPType,Coalition,
     }
     for id,gridpoint in ipairs(Grid) do
       -- Spawn FARP
-      --[[
-      local location = COORDINATE:NewFromVec2(gridpoint)
-      local newfarp = SPAWNSTATIC:NewFromType(STypeName,"Heliports",Country) --  "Invisible FARP" "FARP"
-      newfarp:InitShape(SShapeName) -- "invisiblefarp" "FARPS"
-      newfarp:InitFARP(callsign,freq,mod,DynamicSpawns,HotStart)
-      local spawnedfarp = newfarp:SpawnFromCoordinate(location,0,Name.."-"..id)
-      table.insert(ReturnObjects,spawnedfarp)
-      
-      PopulateStorage(Name.."-"..id,liquids,equip,airframes)
-      --]]
       local UnitTemplate = UTILS.DeepCopy(unitData)
       UnitTemplate.x = gridpoint.x
       UnitTemplate.y = gridpoint.y
-      UnitTemplate.name = Name.."-"..id
+      if id > 1 then UnitTemplate.name = Name.."-"..id end
       table.insert(groupData.units,UnitTemplate)
       if id==1 then
         groupData.x = gridpoint.x