diff --git a/.github/workflows/build-includes.yml b/.github/workflows/build-includes.yml
index 4bd22bdbe..0925e3892 100644
--- a/.github/workflows/build-includes.yml
+++ b/.github/workflows/build-includes.yml
@@ -95,10 +95,6 @@ jobs:
           export COMMIT_TIME=$(git show -s --format=%cd ${{ github.sha }} --date=iso-strict)
           lua5.3 "./Moose Setup/Moose_Create.lua" D "$COMMIT_TIME-${{ github.sha }}" "./Moose Development/Moose" "./Moose Setup" "./build/result/Moose_Include_Dynamic"
 
-      - name: Run LuaSrcDiet
-        run: |
-          luasrcdiet --basic --opt-emptylines ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua
-
       #########################################################################
       # Run LuaCheck
       #########################################################################
@@ -108,6 +104,10 @@ jobs:
         run: |
           luacheck --std=lua51c --config=.luacheckrc -gurasqq "Moose Development/Moose"
 
+      - name: Run LuaSrcDiet
+        run: |
+          luasrcdiet --basic --opt-emptylines ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua
+      
       #########################################################################
       # Push to MOOSE_INCLUDE
       #########################################################################
diff --git a/Moose Development/Moose/Core/Message.lua b/Moose Development/Moose/Core/Message.lua
index 8b6da3cdd..46c896f0d 100644
--- a/Moose Development/Moose/Core/Message.lua	
+++ b/Moose Development/Moose/Core/Message.lua	
@@ -98,7 +98,7 @@ function MESSAGE:New( MessageText, MessageDuration, MessageCategory, ClearScreen
 
   self.MessageType = nil
 
-  -- When no MessageCategory is given, we don't show it as a title...	
+  -- When no MessageCategory is given, we don't show it as a title... 
   if MessageCategory and MessageCategory ~= "" then
     if MessageCategory:sub( -1 ) ~= "\n" then
       self.MessageCategory = MessageCategory .. ": "
@@ -498,7 +498,6 @@ function MESSAGE.SetMSRS(PathToSRS,Port,PathToCredentials,Frequency,Modulation,G
   _MESSAGESRS.Gender = Gender or "female"
 
   _MESSAGESRS.MSRS:SetGoogle(PathToCredentials)
-  _MESSAGESRS.google = PathToCredentials
 
   _MESSAGESRS.MSRS:SetLabel(Label or "MESSAGE")
   _MESSAGESRS.label = Label or "MESSAGE"
@@ -512,8 +511,6 @@ function MESSAGE.SetMSRS(PathToSRS,Port,PathToCredentials,Frequency,Modulation,G
   if Voice then _MESSAGESRS.MSRS:SetVoice(Voice) end
   
   _MESSAGESRS.voice = Voice --or MSRS.Voices.Microsoft.Hedda
-  --if _MESSAGESRS.google and not Voice then _MESSAGESRS.Voice = MSRS.Voices.Google.Standard.en_GB_Standard_A end
-  --_MESSAGESRS.MSRS:SetVoice(Voice or _MESSAGESRS.voice)
   
   _MESSAGESRS.SRSQ = MSRSQUEUE:New(Label or "MESSAGE")
 end
diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua
index 0c83d051e..75b621966 100644
--- a/Moose Development/Moose/Ops/Airboss.lua	
+++ b/Moose Development/Moose/Ops/Airboss.lua	
@@ -14957,7 +14957,7 @@ function AIRBOSS:SetSRSPilotVoice( Voice, Gender, Culture )
   self.PilotRadio.gender = Gender or "male"
   self.PilotRadio.culture = Culture or "en-US"
   
-  if (not Voice) and self.SRS and self.SRS.google then
+  if (not Voice) and self.SRS and self.SRS:GetProvider() == MSRS.Provider.GOOGLE then
     self.PilotRadio.voice = MSRS.Voices.Google.Standard.en_US_Standard_J
   end
   
diff --git a/Moose Development/Moose/Ops/CSAR.lua b/Moose Development/Moose/Ops/CSAR.lua
index becdf6ec3..ee2d58a9b 100644
--- a/Moose Development/Moose/Ops/CSAR.lua	
+++ b/Moose Development/Moose/Ops/CSAR.lua	
@@ -31,7 +31,7 @@
 -- @image OPS_CSAR.jpg
 
 -- Date: May 2023
--- Last: Update Oct 2024
+-- Last: Update Dec 2024
 
 -------------------------------------------------------------------------
 --- **CSAR** class, extends Core.Base#BASE, Core.Fsm#FSM
diff --git a/Moose Development/Moose/Sound/SRS.lua b/Moose Development/Moose/Sound/SRS.lua
index 9ea156e47..118edb9e1 100644
--- a/Moose Development/Moose/Sound/SRS.lua	
+++ b/Moose Development/Moose/Sound/SRS.lua	
@@ -1535,11 +1535,11 @@ function MSRS:_DCSgRPCtts(Text, Frequencies, Gender, Culture, Voice, Volume, Lab
 
     local gender=""
     if self.gender then
-      gender=string.format(' gender=\"\%s\"', self.gender)
+      gender=string.format(' gender=\"%s\"', self.gender)
     end
     local language=""
     if self.culture then
-      language=string.format(' language=\"\%s\"', self.culture)
+      language=string.format(' language=\"%s\"', self.culture)
     end
 
     if self.gender or self.culture then