diff --git a/think-machine-random/src/main/java/com/softwaremagico/tm/character/benefices/RandomBeneficeDefinition.java b/think-machine-random/src/main/java/com/softwaremagico/tm/character/benefices/RandomBeneficeDefinition.java
index 5bc95d80..ae401945 100644
--- a/think-machine-random/src/main/java/com/softwaremagico/tm/character/benefices/RandomBeneficeDefinition.java
+++ b/think-machine-random/src/main/java/com/softwaremagico/tm/character/benefices/RandomBeneficeDefinition.java
@@ -96,6 +96,7 @@ public void assign() throws InvalidXmlElementException, InvalidRandomElementSele
         }
     }
 
+    @SuppressWarnings({"java:S3655"})
     protected int assignBeneficeWithoutLevels(BeneficeDefinition benefice, int maxPoints) throws InvalidXmlElementException, RestrictedElementException {
         final Set<AvailableBenefice> beneficeLevels = AvailableBeneficeFactory.getInstance()
                 .getAvailableBeneficesByDefinition(getCharacterPlayer().getLanguage(),
@@ -105,12 +106,10 @@ protected int assignBeneficeWithoutLevels(BeneficeDefinition benefice, int maxPo
             throw new InvalidBeneficeException("Only benefices without multiples specializations can be use here.");
         }
         final Optional<AvailableBenefice> availableBenefice = beneficeLevels.stream().findAny();
-        if (availableBenefice.isPresent()) {
-            if (availableBenefice.get().getCost() <= maxPoints) {
-                cost = addBenefice(availableBenefice.get());
-            }
-            removeElementWeight(availableBenefice.get().getBeneficeDefinition());
+        if (availableBenefice.get().getCost() <= maxPoints) {
+            cost = addBenefice(availableBenefice.get());
         }
+        removeElementWeight(availableBenefice.get().getBeneficeDefinition());
         return cost;
     }
 
diff --git a/think-machine-rules/src/main/java/com/softwaremagico/tm/character/equipment/weapons/Weapon.java b/think-machine-rules/src/main/java/com/softwaremagico/tm/character/equipment/weapons/Weapon.java
index 7a45dcef..2238cab2 100644
--- a/think-machine-rules/src/main/java/com/softwaremagico/tm/character/equipment/weapons/Weapon.java
+++ b/think-machine-rules/src/main/java/com/softwaremagico/tm/character/equipment/weapons/Weapon.java
@@ -3,7 +3,6 @@
 import com.softwaremagico.tm.character.equipment.DamageType;
 import com.softwaremagico.tm.character.equipment.Equipment;
 import com.softwaremagico.tm.character.equipment.Size;
-import com.softwaremagico.tm.log.SuppressFBWarnings;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -84,7 +83,7 @@ public WeaponType getType() {
     }
 
 
-    @SuppressFBWarnings
+    @SuppressWarnings({"java:S3655"})
     public boolean isMeleeWeapon() {
         return getType() == WeaponType.MELEE || getType() == WeaponType.MELEE_ARTIFACT || getType() == WeaponType.MELEE_SHIELD ||
                 (getWeaponDamages().stream().findFirst().isPresent() && getWeaponDamages().stream().findFirst().get().getRange() == null);
diff --git a/think-machine-rules/src/main/java/com/softwaremagico/tm/file/FileManager.java b/think-machine-rules/src/main/java/com/softwaremagico/tm/file/FileManager.java
index a3ee8f3e..42c11621 100644
--- a/think-machine-rules/src/main/java/com/softwaremagico/tm/file/FileManager.java
+++ b/think-machine-rules/src/main/java/com/softwaremagico/tm/file/FileManager.java
@@ -25,7 +25,6 @@
  */
 
 import com.softwaremagico.tm.log.ConfigurationLog;
-import com.softwaremagico.tm.log.SuppressFBWarnings;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -255,7 +254,7 @@ public static File getResource(String fileName) throws NullPointerException {
         return getResource(FileManager.class, fileName);
     }
 
-    @SuppressFBWarnings
+    @SuppressWarnings({"java:S2259"})
     public static File getResource(Class<?> classWithResources, String fileName) throws NullPointerException {
         final URL url = classWithResources.getClassLoader().getResource(fileName);
         if (url != null) {