diff --git a/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs
index c9ff48a9..1c6187bd 100644
--- a/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs
@@ -660,8 +660,7 @@ public class ItemHelper(
             {
                 // keys - keys count upwards, not down like everything else
                 var maxNumOfUsages = itemDetails.Properties.MaximumNumberOfUsage;
-                result =
-                    (maxNumOfUsages ?? 0 - item.Upd.Key.NumberOfUsages ?? 0) / maxNumOfUsages ?? 0;
+                result = (maxNumOfUsages ?? 0 - item.Upd.Key.NumberOfUsages) / maxNumOfUsages ?? 0;
             }
             else if (item.Upd.Resource?.UnitsConsumed > 0)
             {
@@ -1554,7 +1553,7 @@ public class ItemHelper(
         }
 
         var desiredStackCount = randomUtil.GetInt(
-            (int)Math.Round(minSizeMultiplier * magazineCartridgeMaxCount ?? 0),
+            (int)Math.Round(minSizeMultiplier * magazineCartridgeMaxCount.Value),
             (int)magazineCartridgeMaxCount
         );
 
diff --git a/Libraries/SPTarkov.Server.Core/Helpers/TraderHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/TraderHelper.cs
index 0a4d5c6e..3b29e79f 100644
--- a/Libraries/SPTarkov.Server.Core/Helpers/TraderHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/TraderHelper.cs
@@ -443,7 +443,7 @@ public class TraderHelper(
             loyaltyLevel = traderBase.LoyaltyLevels.Count;
         }
 
-        return traderBase.LoyaltyLevels[loyaltyLevel - 1 ?? 1];
+        return traderBase.LoyaltyLevels[loyaltyLevel.Value - 1];
     }
 
     /// <summary>
diff --git a/Libraries/SPTarkov.Server.Core/Services/BackupService.cs b/Libraries/SPTarkov.Server.Core/Services/BackupService.cs
index 0ccdeb4a..982d5e68 100644
--- a/Libraries/SPTarkov.Server.Core/Services/BackupService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/BackupService.cs
@@ -319,7 +319,7 @@ public class BackupService
 
         foreach (var mod in _loadedMods)
         {
-            result.Add($"{mod.ModMetadata.Author} - {mod.ModMetadata.Version ?? ""}");
+            result.Add($"{mod.ModMetadata.Author} - {mod.ModMetadata.Version}");
         }
 
         return result;
diff --git a/Libraries/SPTarkov.Server.Core/Services/PaymentService.cs b/Libraries/SPTarkov.Server.Core/Services/PaymentService.cs
index b50069bb..a4774642 100644
--- a/Libraries/SPTarkov.Server.Core/Services/PaymentService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/PaymentService.cs
@@ -242,12 +242,12 @@ public class PaymentService(
             }
 
             // Found currency item
-            if (item.Upd.StackObjectsCount < currencyMaxStackSize)
+            if (item.Upd?.StackObjectsCount < currencyMaxStackSize)
             {
                 if (item.Upd.StackObjectsCount + calcAmount > currencyMaxStackSize)
                 {
                     // calculate difference
-                    calcAmount -= (int)(currencyMaxStackSize - item.Upd.StackObjectsCount ?? 0);
+                    calcAmount -= (int)(currencyMaxStackSize - item.Upd.StackObjectsCount);
                     item.Upd.StackObjectsCount = currencyMaxStackSize;
                 }
                 else
diff --git a/Libraries/SPTarkov.Server.Core/Services/SeasonalEventService.cs b/Libraries/SPTarkov.Server.Core/Services/SeasonalEventService.cs
index 962d4f20..dc1b701d 100644
--- a/Libraries/SPTarkov.Server.Core/Services/SeasonalEventService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/SeasonalEventService.cs
@@ -358,7 +358,6 @@ public class SeasonalEventService(
         var christmasItems = GetChristmasEventItems();
 
         // Remove christmas related equipment
-        botInventory.Equipment ??= new Dictionary<EquipmentSlots, Dictionary<MongoId, double>>();
         foreach (var equipmentSlotKey in _equipmentSlotsToFilter)
         {
             if (!botInventory.Equipment.TryGetValue(equipmentSlotKey, out var equipment))