diff --git a/gradle.properties b/gradle.properties
index 4a89932458..58aba6a506 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 apacheCommonsCsvVersion=1.14.1
 
-aspectjVersion=1.9.24
+aspectjVersion=1.9.25.1
 
 assertjVersion=3.27.6
 
diff --git a/src/org/labkey/serverapi/reader/DataLoader.java b/src/org/labkey/serverapi/reader/DataLoader.java
index a44278a553..05e6ffa357 100644
--- a/src/org/labkey/serverapi/reader/DataLoader.java
+++ b/src/org/labkey/serverapi/reader/DataLoader.java
@@ -483,13 +483,6 @@ public void close() throws IOException
         {
             _closed = true;
         }
-
-        @Override
-        protected void finalize() throws Throwable
-        {
-            super.finalize();
-            // assert _closed;  TODO: Uncomment to force all callers to close iterator.
-        }
     }
 }
 
diff --git a/src/org/labkey/test/tests/component/EditableGridTest.java b/src/org/labkey/test/tests/component/EditableGridTest.java
index 6a1ca1760f..1c03680466 100644
--- a/src/org/labkey/test/tests/component/EditableGridTest.java
+++ b/src/org/labkey/test/tests/component/EditableGridTest.java
@@ -1,6 +1,7 @@
 package org.labkey.test.tests.component;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.mutable.MutableInt;
 import org.json.JSONObject;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
@@ -314,8 +315,8 @@ public void testDragFillSingleRow()
         // Get the various row heights before adding a value to the multiLine field.
         WebElement gridRow = Locator.tag("tr").findElements(testGrid).get(1);
         int rowHeightBefore = gridRow.getSize().height;
-        var totalHeightBefore = new Object(){int size = 0; };
-        Locator.tag("tr").findElements(testGrid).forEach(gr -> totalHeightBefore.size = totalHeightBefore.size + gr.getSize().height);
+        var totalHeightBefore = new MutableInt(0);
+        Locator.tag("tr").findElements(testGrid).forEach(gr -> totalHeightBefore.add(gr.getSize().height));
         WebElement topLeft = testGrid.setCellValue(0, FILL_STRING, stringValue);
 
         testGrid.setCellValue(0, FILL_INT, intValue);
@@ -351,12 +352,12 @@ public void testDragFillSingleRow()
                 testGrid.getColumnData(FILL_DATE));
 
         // Check that pasting increased the size of all the rows.
-        var totalHeightAfter = new Object(){int size = 0; };
-        Locator.tag("tr").findElements(testGrid).forEach(gr -> totalHeightAfter.size = totalHeightAfter.size + gr.getSize().height);
+        var totalHeightAfter = new MutableInt(0);
+        Locator.tag("tr").findElements(testGrid).forEach(gr -> totalHeightAfter.add(gr.getSize().height));
 
         checker().withScreenshot()
                 .verifyTrue("The total height of all the rows should have increases after the paste.",
-                        totalHeightBefore.size + (3 * rowHeightBefore) >= totalHeightAfter.size);
+                        totalHeightBefore.intValue() + (3 * rowHeightBefore) >= totalHeightAfter.intValue());
     }
 
     @Test