diff --git a/Libraries/Core/Callbacks/DialogueCallbacks.cs b/Libraries/Core/Callbacks/DialogueCallbacks.cs
index bf38b2ec..7c36af62 100644
--- a/Libraries/Core/Callbacks/DialogueCallbacks.cs
+++ b/Libraries/Core/Callbacks/DialogueCallbacks.cs
@@ -321,10 +321,10 @@ public class DialogueCallbacks(
         throw new NotImplementedException(); // Not implemented in Node
     }
 
-    public Task<bool> OnUpdate(long timeSinceLastRun)
+    public bool OnUpdate(long timeSinceLastRun)
     {
         _dialogueController.Update();
-        return Task.FromResult(true);
+        return true;
     }
 
     public string GetRoute()
diff --git a/Libraries/Core/Callbacks/HideoutCallbacks.cs b/Libraries/Core/Callbacks/HideoutCallbacks.cs
index 567347b2..b60bf383 100644
--- a/Libraries/Core/Callbacks/HideoutCallbacks.cs
+++ b/Libraries/Core/Callbacks/HideoutCallbacks.cs
@@ -161,16 +161,16 @@ public class HideoutCallbacks(
         return _hideoutController.HideoutCustomizationSetMannequinPose(sessionId, pmcData, request);
     }
 
-    public Task<bool> OnUpdate(long timeSinceLastRun)
+    public bool OnUpdate(long timeSinceLastRun)
     {
         if (timeSinceLastRun > _hideoutConfig.RunIntervalSeconds)
         {
             // TODO
             // _hideoutController.Update();
-            return Task.FromResult(true);
+            return true;
         }
 
-        return Task.FromResult(false);
+        return false;
     }
 
     public string GetRoute()
diff --git a/Libraries/Core/Callbacks/InsuranceCallbacks.cs b/Libraries/Core/Callbacks/InsuranceCallbacks.cs
index eed0fbde..da817de6 100644
--- a/Libraries/Core/Callbacks/InsuranceCallbacks.cs
+++ b/Libraries/Core/Callbacks/InsuranceCallbacks.cs
@@ -49,16 +49,16 @@ public class InsuranceCallbacks(
         throw new NotImplementedException();
     }
 
-    public Task<bool> OnUpdate(long timeSinceLastRun)
+    public bool OnUpdate(long timeSinceLastRun)
     {
         if (timeSinceLastRun > Math.Max(_insuranceConfig.RunIntervalSeconds, 1))
         {
             // _insuranceController.ProcessReturn();
             // TODO: InsuranceController is not implemented rn
-            return Task.FromResult(true);
+            return true;
         }
 
-        return Task.FromResult(false);
+        return false;
     }
 
     public string GetRoute()
diff --git a/Libraries/Core/Callbacks/ItemEventCallbacks.cs b/Libraries/Core/Callbacks/ItemEventCallbacks.cs
index ba203475..e5521aff 100644
--- a/Libraries/Core/Callbacks/ItemEventCallbacks.cs
+++ b/Libraries/Core/Callbacks/ItemEventCallbacks.cs
@@ -24,8 +24,13 @@ public class ItemEventCallbacks(HttpResponseUtil _httpResponseUtil, ItemEventRou
     /// </summary>
     /// <param name="warnings">The list of warnings to check for critical errors</param>
     /// <returns></returns>
-    public bool IsCriticalError(List<Warning> warnings)
+    public bool IsCriticalError(List<Warning>? warnings)
     {
+        if (warnings is null)
+        {
+            return false;
+        }
+        
         // List of non-critical error codes, we return true if any error NOT included is passed in
         var nonCriticalErrorCodes = new List<BackendErrorCodes> { BackendErrorCodes.NotEnoughSpace };
 
diff --git a/Libraries/Core/Callbacks/RagfairCallbacks.cs b/Libraries/Core/Callbacks/RagfairCallbacks.cs
index ce8dfed3..9c0add4c 100644
--- a/Libraries/Core/Callbacks/RagfairCallbacks.cs
+++ b/Libraries/Core/Callbacks/RagfairCallbacks.cs
@@ -24,9 +24,10 @@ public class RagfairCallbacks(
 {
     private RagfairConfig _ragfairConfig = _configServer.GetConfig<RagfairConfig>();
 
-    public async Task OnLoad()
+    public Task OnLoad()
     {
         // await _ragfairServer.Load();
+        return Task.CompletedTask;
     }
 
     public string GetRoute()
@@ -34,7 +35,7 @@ public class RagfairCallbacks(
         return "spt-ragfair";
     }
 
-    public async Task<bool> OnUpdate(long timeSinceLastRun)
+    public bool OnUpdate(long timeSinceLastRun)
     {
          if (timeSinceLastRun > _ragfairConfig.RunIntervalSeconds) {
             // There is a flag inside this class that only makes it run once.
@@ -44,7 +45,7 @@ public class RagfairCallbacks(
              _ragfairController.Update();
         
              // Process all offers / expire offers
-             await _ragfairServer.Update();
+             _ragfairServer.Update();
         
              return true;
          }
diff --git a/Libraries/Core/Callbacks/SaveCallbacks.cs b/Libraries/Core/Callbacks/SaveCallbacks.cs
index 5957b62c..e9536156 100644
--- a/Libraries/Core/Callbacks/SaveCallbacks.cs
+++ b/Libraries/Core/Callbacks/SaveCallbacks.cs
@@ -23,15 +23,15 @@ public class SaveCallbacks(
         _saveServer.Load();
     }
 
-    public Task<bool> OnUpdate(long secondsSinceLastRun)
+    public bool OnUpdate(long secondsSinceLastRun)
     {
         if (secondsSinceLastRun > _coreConfig.ProfileSaveIntervalInSeconds)
         {
             _saveServer.Save();
-            return Task.FromResult(true);
+            return true;
         }
 
-        return Task.FromResult(false);
+        return false;
     }
 
     public string GetRoute()
diff --git a/Libraries/Core/Callbacks/TraderCallbacks.cs b/Libraries/Core/Callbacks/TraderCallbacks.cs
index 36b9adc9..c9af3b2c 100644
--- a/Libraries/Core/Callbacks/TraderCallbacks.cs
+++ b/Libraries/Core/Callbacks/TraderCallbacks.cs
@@ -25,9 +25,9 @@ public class TraderCallbacks(
         return Task.CompletedTask;
     }
 
-    public Task<bool> OnUpdate(long _)
+    public bool OnUpdate(long _)
     {
-        return Task.FromResult(_traderController.Update());
+        return _traderController.Update();
     }
 
     public string GetRoute()