diff --git a/flow/src/org/labkey/flow/controllers/executescript/SamplesConfirmGridView.java b/flow/src/org/labkey/flow/controllers/executescript/SamplesConfirmGridView.java
index 9c2fd5b60..0d20c6428 100644
--- a/flow/src/org/labkey/flow/controllers/executescript/SamplesConfirmGridView.java
+++ b/flow/src/org/labkey/flow/controllers/executescript/SamplesConfirmGridView.java
@@ -27,7 +27,7 @@
 import org.labkey.api.data.ActionButton;
 import org.labkey.api.data.BaseColumnInfo;
 import org.labkey.api.data.ButtonBar;
-import org.labkey.api.data.CachedResultSets;
+import org.labkey.api.data.CachedResultSetBuilder;
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.DataRegion;
@@ -62,7 +62,6 @@
 import java.sql.ResultSet;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -191,7 +190,7 @@ public SamplesConfirmGridView(User user, Container container, Collection<String>
         maps.addAll(matchedList);
 
         // Initialize the ResultSet and DataRegion
-        ResultSet rs = CachedResultSets.create(maps);
+        ResultSet rs = CachedResultSetBuilder.create(maps).build();
         Results results = new ResultsImpl(rs, (Map<FieldKey,ColumnInfo>)(Map)columns);
         setResults(results);
 
diff --git a/flow/src/org/labkey/flow/persist/FlowManager.java b/flow/src/org/labkey/flow/persist/FlowManager.java
index c5509b9fe..522c1cee0 100644
--- a/flow/src/org/labkey/flow/persist/FlowManager.java
+++ b/flow/src/org/labkey/flow/persist/FlowManager.java
@@ -228,9 +228,9 @@ private List<FlowEntry> getAttributeEntryCaseInsensitive(String containerId, Att
     {
         //_log.info("getAttributeEntryCaseInsensitive(" + containerId + ", " + type + ", " + attr + ")");
         SQLFragment sql = new SQLFragment("SELECT Name, RowId, Id FROM ")
-                .append(attributeTable(type))
-                .append(" WHERE Container = ?").add(containerId)
-                .append(" AND lower(Name) = lower(?)").add(attr);
+            .append(attributeTable(type))
+            .append(" WHERE Container = ?").add(containerId)
+            .append(" AND lower(Name) = lower(?)").add(attr);
 
         return new SqlSelector(getSchema(), sql).mapStream().map(map -> {
             String name = (String)map.get("Name");
@@ -1674,7 +1674,7 @@ public void updateStatistics(int currentRow) { }
             List<Map<String, Object>> propMaps = new ArrayList<>(1000);
 
             SqlSelector ss = new SqlSelector(getSchema(), sqlSelectDateTime);
-            ss.mapStream().forEach(row -> {
+            ss.forEachMap(row -> {
 
                 // parse the date
                 String dateStr = (String) row.get("datetime");
diff --git a/flow/src/org/labkey/flow/reports/FilterFlowReport.java b/flow/src/org/labkey/flow/reports/FilterFlowReport.java
index e1cc14410..641e3407e 100644
--- a/flow/src/org/labkey/flow/reports/FilterFlowReport.java
+++ b/flow/src/org/labkey/flow/reports/FilterFlowReport.java
@@ -20,7 +20,7 @@
 import org.apache.commons.beanutils.ConversionException;
 import org.apache.commons.lang3.StringUtils;
 import org.labkey.api.data.CachedResultSet;
-import org.labkey.api.data.CachedResultSets;
+import org.labkey.api.data.CachedResultSetBuilder;
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.CompareType;
 import org.labkey.api.data.Container;
@@ -267,7 +267,7 @@ protected CachedResultSet filterDateRange(CachedResultSet rs, String dateColumn,
         else
         {
             // rs is a CachedResultSet, so its metadata is cached. No need to cache it again
-            ret = CachedResultSets.create(rs.getMetaData(), rows, true);
+            ret = CachedResultSetBuilder.create(rows).setMetaData(rs.getMetaData()).build();
             rs.close();
         }