diff --git a/commons/audit/core/src/main/java/org/forgerock/audit/AuditServiceImpl.java b/commons/audit/core/src/main/java/org/forgerock/audit/AuditServiceImpl.java
index 5bb5aedfa..57da85ffc 100644
--- a/commons/audit/core/src/main/java/org/forgerock/audit/AuditServiceImpl.java
+++ b/commons/audit/core/src/main/java/org/forgerock/audit/AuditServiceImpl.java
@@ -468,7 +468,7 @@ private enum LifecycleState {
     /**
      * Substitute {@link AuditEventHandler} to use when no query handler is available.
      */
-    private final class NullQueryHandler implements AuditEventHandler {
+    private static final class NullQueryHandler implements AuditEventHandler {
 
         private final String errorMessage;
 
diff --git a/commons/audit/handler-csv/src/main/java/org/forgerock/audit/handlers/csv/CsvAuditEventHandler.java b/commons/audit/handler-csv/src/main/java/org/forgerock/audit/handlers/csv/CsvAuditEventHandler.java
index c32a549ee..2e82b5cfa 100644
--- a/commons/audit/handler-csv/src/main/java/org/forgerock/audit/handlers/csv/CsvAuditEventHandler.java
+++ b/commons/audit/handler-csv/src/main/java/org/forgerock/audit/handlers/csv/CsvAuditEventHandler.java
@@ -544,7 +544,7 @@ private CellProcessor[] createCellProcessors(final String auditEntryType, final
     /**
      * CellProcessor for parsing JsonValue objects from CSV file.
      */
-    public class ParseJsonValue implements CellProcessor {
+    public static class ParseJsonValue implements CellProcessor {
 
         @Override
         public Object execute(final Object value, final CsvContext context) {
diff --git a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/utils/Profiler.java b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/utils/Profiler.java
index 935b7e1c0..d4ef8837a 100644
--- a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/utils/Profiler.java
+++ b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/utils/Profiler.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.doc.maven.utils;
@@ -181,7 +182,7 @@ private String getExclusionsMatch(final String attribute, final String[] values)
     /**
      * Applies an XSL transformation to the matching files.
      */
-    private class Transformer extends XmlTransformer {
+    private static class Transformer extends XmlTransformer {
         /**
          * Constructs an updater to match DocBook XML files.
          * <br>
diff --git a/commons/http-framework/binding-test-utils/src/main/java/org/forgerock/http/bindings/BindingTest.java b/commons/http-framework/binding-test-utils/src/main/java/org/forgerock/http/bindings/BindingTest.java
index 2efcfde9d..9f71984ae 100644
--- a/commons/http-framework/binding-test-utils/src/main/java/org/forgerock/http/bindings/BindingTest.java
+++ b/commons/http-framework/binding-test-utils/src/main/java/org/forgerock/http/bindings/BindingTest.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.http.bindings;
@@ -314,7 +315,7 @@ public void removeDescriptorListener(Listener listener) {
         }
     }
 
-    private final class TestSessionHandler implements Handler {
+    private static final class TestSessionHandler implements Handler {
         @Override
         public Promise<Response, NeverThrowsException> handle(Context context, Request request) {
             final Session session = context.asContext(SessionContext.class).getSession();
diff --git a/commons/http-framework/core/src/main/java/org/forgerock/http/io/BranchingStreamWrapper.java b/commons/http-framework/core/src/main/java/org/forgerock/http/io/BranchingStreamWrapper.java
index c0335dfcc..2a4432d05 100644
--- a/commons/http-framework/core/src/main/java/org/forgerock/http/io/BranchingStreamWrapper.java
+++ b/commons/http-framework/core/src/main/java/org/forgerock/http/io/BranchingStreamWrapper.java
@@ -13,7 +13,7 @@
  *
  * Copyright 2010–2011 ApexIdentity Inc.
  * Portions Copyright 2011-2016 ForgeRock AS.
- * Portions copyright 2026 3A Systems LLC.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.http.io;
@@ -273,7 +273,7 @@ private void writeBuffer(byte[] b, int off, int len) throws IOException {
     }
 
     /** Object shared by all branches. */
-    private final class Trunk {
+    private static final class Trunk {
         /** Keeps track of all branches on this trunk. */
         private final List<BranchingStreamWrapper> branches = new ArrayList<>();
 
diff --git a/commons/httpdump/src/main/java/ru/org/openam/httpdump/BufferedRequestWrapper.java b/commons/httpdump/src/main/java/ru/org/openam/httpdump/BufferedRequestWrapper.java
index 8bbbdacf6..65ff90bff 100644
--- a/commons/httpdump/src/main/java/ru/org/openam/httpdump/BufferedRequestWrapper.java
+++ b/commons/httpdump/src/main/java/ru/org/openam/httpdump/BufferedRequestWrapper.java
@@ -74,7 +74,7 @@ public BufferedReader getReader() throws IOException {
         return new BufferedReader(new InputStreamReader(getInputStream(), enc));
     }
 
-    private class ServletInputStreamImpl extends ServletInputStream {
+    private static class ServletInputStreamImpl extends ServletInputStream {
         private ByteArrayInputStream is;
 
         public ServletInputStreamImpl(ByteArrayInputStream is) {
diff --git a/commons/util/util/src/main/java/org/forgerock/util/thread/ExecutorServiceFactory.java b/commons/util/util/src/main/java/org/forgerock/util/thread/ExecutorServiceFactory.java
index 0f42416b9..3f586dfa0 100644
--- a/commons/util/util/src/main/java/org/forgerock/util/thread/ExecutorServiceFactory.java
+++ b/commons/util/util/src/main/java/org/forgerock/util/thread/ExecutorServiceFactory.java
@@ -199,7 +199,7 @@ public void shutdown() {
      * have its generated number appended to the end of it, in the form -X, where
      * X is incremented once for each thread created.
      */
-    private class NamedThreadFactory implements ThreadFactory {
+    private static class NamedThreadFactory implements ThreadFactory {
 
         private final AtomicInteger count = new AtomicInteger(0);
         private final String name;
diff --git a/persistit/core/src/main/java/com/persistit/JournalManager.java b/persistit/core/src/main/java/com/persistit/JournalManager.java
index dbd4687c7..d6c1cee98 100644
--- a/persistit/core/src/main/java/com/persistit/JournalManager.java
+++ b/persistit/core/src/main/java/com/persistit/JournalManager.java
@@ -2837,7 +2837,7 @@ public Persistit getPersistit() {
         }
     }
 
-    class PruneTransactionPlayer implements TransactionPlayerListener
+    static class PruneTransactionPlayer implements TransactionPlayerListener
     {
 
       @Override
diff --git a/persistit/ui/src/main/java/com/persistit/ui/ManagementTableModel.java b/persistit/ui/src/main/java/com/persistit/ui/ManagementTableModel.java
index db84be872..b968636c1 100644
--- a/persistit/ui/src/main/java/com/persistit/ui/ManagementTableModel.java
+++ b/persistit/ui/src/main/java/com/persistit/ui/ManagementTableModel.java
@@ -288,7 +288,7 @@ public Class getColumnClass(final int col) {
      * Default Renderers
      **/
 
-    class AlignedCellRenderer extends DefaultTableCellRenderer {
+    static class AlignedCellRenderer extends DefaultTableCellRenderer {
         AlignedCellRenderer(final int alignment) {
             super();
             setHorizontalAlignment(alignment);
@@ -334,7 +334,7 @@ public void setValue(final Object value) {
         }
     }
 
-    class KeyStateRenderer extends AlignedCellRenderer {
+    static class KeyStateRenderer extends AlignedCellRenderer {
         private final Key _key;
 
         public KeyStateRenderer() {
@@ -352,7 +352,7 @@ public void setValue(final Object value) {
         }
     }
 
-    class ValueStateRenderer extends AlignedCellRenderer {
+    static class ValueStateRenderer extends AlignedCellRenderer {
         private final Value _value;
 
         public ValueStateRenderer() {
diff --git a/persistit/ui/src/main/java/com/persistit/ui/ValueInspectorTreeNode.java b/persistit/ui/src/main/java/com/persistit/ui/ValueInspectorTreeNode.java
index c42e1efb9..46a16e65d 100644
--- a/persistit/ui/src/main/java/com/persistit/ui/ValueInspectorTreeNode.java
+++ b/persistit/ui/src/main/java/com/persistit/ui/ValueInspectorTreeNode.java
@@ -423,7 +423,7 @@ private Field[] getFields(final Class type) {
         return array;
     }
 
-    private class FieldComparator implements Comparator {
+    private static class FieldComparator implements Comparator {
         @Override
         public int compare(final Object a, final Object b) {
             final Field fieldA = (Field) a;