diff --git a/api/src/org/labkey/api/security/GroupManager.java b/api/src/org/labkey/api/security/GroupManager.java
index c89def1303c..bef4fc30145 100644
--- a/api/src/org/labkey/api/security/GroupManager.java
+++ b/api/src/org/labkey/api/security/GroupManager.java
@@ -205,7 +205,9 @@ private static void appendDotAttribute(StringBuilder sb, boolean prependComma, S
         if (prependComma)
             sb.append(", ");
 
-        sb.append(name).append("=\"").append(value).append("\"");
+        // Escape backslashes first, then quotes, to produce a valid DOT quoted string
+        String escaped = value.replace("\\", "\\\\").replace("\"", "\\\"");
+        sb.append(name).append("=\"").append(escaped).append("\"");
     }
 
     public static void exportGroupMembers(Group group, List<Group> memberGroups, List<User> memberUsers, GroupType xmlGroupType)
diff --git a/api/src/org/labkey/api/util/MemTrackerListener.java b/api/src/org/labkey/api/util/MemTrackerListener.java
index cf917c3a14f..796286f1c46 100644
--- a/api/src/org/labkey/api/util/MemTrackerListener.java
+++ b/api/src/org/labkey/api/util/MemTrackerListener.java
@@ -25,7 +25,7 @@ public interface MemTrackerListener
 {
     /**
      * Called before GC and tallying of held objects. Implementors should purge held objects and (optionally) add
-     * objects to the passed in set that should be ignored .
+     * objects to the passed in set that should be ignored.
      */
     void beforeReport(Set<Object> set);
 }
diff --git a/api/src/org/labkey/api/view/template/errorView.jsp b/api/src/org/labkey/api/view/template/errorView.jsp
index 04234599107..423ec25f9a0 100644
--- a/api/src/org/labkey/api/view/template/errorView.jsp
+++ b/api/src/org/labkey/api/view/template/errorView.jsp
@@ -24,19 +24,6 @@
 
 <div id="<%=h(appId)%>"></div>
 
-<%
-    StringBuilder stackTrace = new StringBuilder();
-    if (null != model.getException())
-    {
-        stackTrace.append(model.getException().toString());
-        for (StackTraceElement stackTraceElement : model.getException().getStackTrace())
-        {
-            stackTrace.append("\n");
-            stackTrace.append(stackTraceElement.toString());
-        }
-    }
-%>
-
 <script type="text/javascript" nonce="<%=getScriptNonce()%>">
     /*
          This error page may be invoked without the themes having been loaded for this container.
@@ -52,7 +39,6 @@
             errorDetails : {
                 message: <%=q(model.getHeading())%>,
                 errorType: <%=q(model.getErrorType())%>,
-                stackTrace: <%=q(stackTrace.toString())%>,
                 errorCode: <%=q(model.getErrorCode())%>,
                 advice: <%=q(model.getAdvice())%>
             }
diff --git a/core/src/client/ErrorHandler/ErrorHandler.test.tsx b/core/src/client/ErrorHandler/ErrorHandler.test.tsx
index 9d437007a63..0e796ae3005 100644
--- a/core/src/client/ErrorHandler/ErrorHandler.test.tsx
+++ b/core/src/client/ErrorHandler/ErrorHandler.test.tsx
@@ -68,19 +68,15 @@ describe('ErrorHandlerImpl', () => {
     });
 
     test('Execution exception', async () => {
-        const expectedStackTrace = 'java.lang.NullPointerException: null';
-
         const errorDetails: ErrorDetails = {
             errorType: ErrorType.execution,
             errorCode: '456AAA',
             message: 'This is a execution exception',
-            stackTrace: expectedStackTrace,
         };
         renderWithAppContext(<ErrorHandlerImpl context={{ errorDetails }} />);
         expect(document.querySelector('.labkey-error-subheading').innerHTML.includes(errorDetails.message)).toBeTruthy();
         expect(document.querySelectorAll('.error-details-container')).toHaveLength(0);
 
         await userEvent.click(document.querySelectorAll('.error-page-button')[2]);
-        expect(document.querySelector('pre').innerHTML.startsWith(expectedStackTrace)).toBeTruthy();
     });
 });
diff --git a/core/src/client/ErrorHandler/ErrorHandler.tsx b/core/src/client/ErrorHandler/ErrorHandler.tsx
index 0c441db0390..ac799cf92c7 100644
--- a/core/src/client/ErrorHandler/ErrorHandler.tsx
+++ b/core/src/client/ErrorHandler/ErrorHandler.tsx
@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import { ActionURL } from '@labkey/api';
 
-import { getErrorHeading, getImage, getInstruction, getSubHeading, getViewDetails } from './ErrorType';
+import { getErrorHeading, getImage, getInstruction, getShowDetailsBtn, getSubHeading, getViewDetails } from './ErrorType';
 import { ErrorDetails } from './model';
 import { withServerContext } from '@labkey/components';
 
@@ -61,7 +61,7 @@ export class ErrorHandlerImpl extends PureComponent<ErrorHandlerProps, ErrorHand
                                 <button className="btn btn-default error-page-button" onClick={this.onHomeClick}>
                                     Home
                                 </button>
-                                {!errorDetails.hideViewDetails &&
+                                {!errorDetails.hideViewDetails && getShowDetailsBtn(errorDetails) &&
                                     <button className="btn btn-default error-page-button" onClick={this.onViewDetailsClick}>
                                         {viewDetailsBtnText}
                                     </button>
diff --git a/core/src/client/ErrorHandler/ErrorType.tsx b/core/src/client/ErrorHandler/ErrorType.tsx
index 168ac0dba7f..e55e63975b4 100644
--- a/core/src/client/ErrorHandler/ErrorType.tsx
+++ b/core/src/client/ErrorHandler/ErrorType.tsx
@@ -211,7 +211,6 @@ const CONFIGURATION_DETAILS = (errorDetails: ErrorDetails) => (
         </div>
 
         {DETAILS_SUB_INSTRUCTION}
-        <pre>{errorDetails.stackTrace}</pre>
     </>
 );
 
@@ -231,21 +230,21 @@ const EXECUTION_INSTRUCTION = (errorDetails: ErrorDetails) => (
                 {' '}
                 find help resources here{' '}
             </a>{' '}
-            and may find troubleshooting hints by reading the full stack trace in the View Details section
-            below.
+            and may find troubleshooting hints by reading the full stack trace in the server logs.
         </div>
         <div className="labkey-error-instruction">
             Your unique reference code is: <b>{errorDetails.errorCode}</b>
         </div>
     </>
 );
-const EXECUTION_DETAILS = (errorDetails: ErrorDetails) => <pre>{errorDetails.stackTrace}</pre>;
+const EXECUTION_DETAILS = () => null;
 
 type ErrorTypeInfo = {
     details: (errorDetails?: ErrorDetails) => ReactNode;
     heading: (errorMessage?: string) => ReactNode;
     imagePath: string;
     instruction: (errorDetails?: ErrorDetails) => ReactNode;
+    showDetailsBtn: boolean;
     subHeading: (errorMessage?: string) => ReactNode;
 };
 
@@ -257,6 +256,7 @@ const ERROR_TYPE_INFO: { [key in ErrorType]: ErrorTypeInfo } = {
         heading: CONFIGURATION_HEADING,
         imagePath: 'configuration_error.svg',
         instruction: CONFIGURATION_INSTRUCTION,
+        showDetailsBtn: true,
         subHeading: CONFIGURATION_SUBHEADING,
     },
     execution: {
@@ -264,6 +264,7 @@ const ERROR_TYPE_INFO: { [key in ErrorType]: ErrorTypeInfo } = {
         heading: ERROR_HEADING,
         imagePath: 'code_error.svg',
         instruction: EXECUTION_INSTRUCTION,
+        showDetailsBtn: false,
         subHeading: EXECUTION_SUB_HEADING,
     },
     notFound: {
@@ -271,6 +272,7 @@ const ERROR_TYPE_INFO: { [key in ErrorType]: ErrorTypeInfo } = {
         heading: NOTFOUND_HEADING,
         imagePath: 'notFound_error.svg',
         instruction: NOTFOUND_INSTRUCTION,
+        showDetailsBtn: true,
         subHeading: NOTFOUND_SUBHEADING,
     },
     permission: {
@@ -278,6 +280,7 @@ const ERROR_TYPE_INFO: { [key in ErrorType]: ErrorTypeInfo } = {
         heading: ERROR_HEADING,
         imagePath: 'permission_error.svg',
         instruction: PERMISSION_INSTRUCTION,
+        showDetailsBtn: true,
         subHeading: PERMISSION_SUBHEADING,
     },
 };
@@ -310,6 +313,11 @@ export const getInstruction = (errorDetails: ErrorDetails): ReactNode => {
     return <div className="labkey-error-instruction">{info.instruction(errorDetails)}</div>;
 };
 
+export const getShowDetailsBtn = (errorDetails: ErrorDetails): boolean => {
+    const info = ERROR_TYPE_INFO[errorDetails.errorType];
+    return info?.showDetailsBtn ?? true;
+};
+
 export const getViewDetails = (errorDetails: ErrorDetails): ReactNode => {
     const info = ERROR_TYPE_INFO[errorDetails.errorType];
     if (!info) return null;
diff --git a/core/src/client/ErrorHandler/model.ts b/core/src/client/ErrorHandler/model.ts
index eee5302dba6..49a68ee1b95 100644
--- a/core/src/client/ErrorHandler/model.ts
+++ b/core/src/client/ErrorHandler/model.ts
@@ -9,7 +9,6 @@ export interface ErrorDetails {
     errorCode?: string;
     errorType: ErrorType;
     message?: string;
-    stackTrace?: string;
     hideViewDetails?: boolean;
     advice?: string;
 }
diff --git a/core/src/org/labkey/core/CoreController.java b/core/src/org/labkey/core/CoreController.java
index 8142f50e0e7..973d7e0655f 100644
--- a/core/src/org/labkey/core/CoreController.java
+++ b/core/src/org/labkey/core/CoreController.java
@@ -487,7 +487,7 @@ else if (form.getSchemaName() != null && form.getQueryName() != null && form.get
                 {
                     throw new NotFoundException("The file '" + file.getName() + "' attached to the object '" + identifiable.getName() + "' cannot be found. It may have been deleted.");
                 }
-                throw new NotFoundException("File " + file.getPath() + " does not exist on the server file system. It may have been deleted.");
+                throw new NotFoundException("File " + file.getName() + " does not exist on the server file system. It may have been deleted.");
             }
 
             if (file.isDirectory())
@@ -654,6 +654,7 @@ private static byte[] compressCSS(String s)
         catch (StackOverflowError e)
         {
             // replaceAll() can blow up
+            _log.error("StackOverflowError compressing CSS");
         }
         return Compress.compressGzip(c.trim());
     }
@@ -935,6 +936,11 @@ public void validateForm(SimpleApiJsonForm form, Errors errors)
                 errors.reject(ERROR_MSG, "The container '" + parentIdentifier + "' is not a valid parent folder.");
                 return;
             }
+
+            if (!target.hasPermission(getUser(), AdminPermission.class))
+            {
+                throw new UnauthorizedException("You must be an administrator for the target container");
+            }
         }
 
         @Override
@@ -2390,6 +2396,10 @@ public Object execute(Object o, BindException errors)
         }
     }
 
+    /**
+     * This action doesn't require any permissions, as the call to WarningService.getWarnings()
+     * only returns warnings appropriate for the user/guest
+     */
     @RequiresNoPermission
     @AllowedDuringUpgrade
     public static class DisplayWarningsAction extends MutatingApiAction<Object>
@@ -2721,7 +2731,7 @@ public void setToFormat(String toFormat)
     }
 
     @SuppressWarnings("unused") // Called from JavaScript: discuss.js, wikiEdit.js
-    @RequiresNoPermission
+    @RequiresPermission(ReadPermission.class)
     public static class TransformWikiAction extends MutatingApiAction<TransformWikiForm>
     {
         @Override
diff --git a/core/src/org/labkey/core/admin/AdminController.java b/core/src/org/labkey/core/admin/AdminController.java
index d0907560eed..15d0ba871c1 100644
--- a/core/src/org/labkey/core/admin/AdminController.java
+++ b/core/src/org/labkey/core/admin/AdminController.java
@@ -303,7 +303,6 @@
 import org.labkey.api.view.NavTree;
 import org.labkey.api.view.NotFoundException;
 import org.labkey.api.view.Portal;
-import org.labkey.api.view.RedirectException;
 import org.labkey.api.view.ShortURLRecord;
 import org.labkey.api.view.ShortURLService;
 import org.labkey.api.view.TabStripView;
@@ -315,6 +314,7 @@
 import org.labkey.api.view.ViewServlet;
 import org.labkey.api.view.WebPartView;
 import org.labkey.api.view.template.EmptyView;
+import org.labkey.api.view.template.ClientDependency;
 import org.labkey.api.view.template.PageConfig;
 import org.labkey.api.view.template.PageConfig.Template;
 import org.labkey.api.wiki.WikiRendererType;
@@ -417,10 +417,12 @@
 import static org.labkey.api.util.DOM.Attribute.title;
 import static org.labkey.api.util.DOM.Attribute.type;
 import static org.labkey.api.util.DOM.Attribute.value;
+import static org.labkey.api.util.DOM.B;
 import static org.labkey.api.util.DOM.BR;
 import static org.labkey.api.util.DOM.DIV;
 import static org.labkey.api.util.DOM.IMG;
 import static org.labkey.api.util.DOM.LI;
+import static org.labkey.api.util.DOM.P;
 import static org.labkey.api.util.DOM.SPAN;
 import static org.labkey.api.util.DOM.STYLE;
 import static org.labkey.api.util.DOM.TABLE;
@@ -2699,23 +2701,41 @@ public PostgresTableSizesAction()
     }
 
     @AdminConsoleAction
-    public class DumpHeapAction extends SimpleViewAction<Object>
+    public class DumpHeapAction extends ConfirmAction<Object>
     {
+        private File _destination;
+
         @Override
-        public ModelAndView getView(Object o, BindException errors) throws Exception
+        public ModelAndView getConfirmView(Object o, BindException errors)
         {
-            File destination = DebugInfoDumper.dumpHeap();
-            return new HtmlView(HtmlString.of("Heap dumped to " + destination.getAbsolutePath()));
+            setTitle("Dump Heap");
+            return HtmlView.of("Are you sure you want to dump the JVM heap to disk? Heap dumps are useful for troubleshooting memory leaks or OutOfMemoryErrors. This may temporarily slow the server and will consume significant disk space.");
         }
 
         @Override
-        public void addNavTrail(NavTree root)
+        public boolean handlePost(Object o, BindException errors) throws Exception
         {
-            setHelpTopic("dumpHeap");
-            addAdminNavTrail(root, "Heap dump", getClass());
+            _destination = DebugInfoDumper.dumpHeap();
+            return true;
         }
-    }
 
+        @Override
+        public ModelAndView getSuccessView(Object o)
+        {
+            return new HtmlView(HtmlString.of("Heap dumped to " + _destination.getAbsolutePath()));
+        }
+
+        @Override
+        public void validateCommand(Object o, Errors errors)
+        {
+        }
+
+        @Override
+        public @NotNull URLHelper getSuccessURL(Object o)
+        {
+            return getShowAdminURL();
+        }
+    }
 
     public static class ThreadsBean
     {
@@ -3198,32 +3218,10 @@ public class CachesAction extends SimpleViewAction<MemForm>
         @Override
         public ModelAndView getView(MemForm form, BindException errors)
         {
-            if (form.isClearCaches())
-            {
-                LOG.info("Clearing Introspector caches");
-                Introspector.flushCaches();
-                LOG.info("Purging all caches");
-                CacheManager.clearAllKnownCaches();
-                ActionURL redirect = getViewContext().cloneActionURL().deleteParameter("clearCaches");
-                throw new RedirectException(redirect);
-            }
+            getPageConfig().addClientDependency(ClientDependency.fromPath("admin/caches.js"));
 
             List<TrackingCache<?, ?>> caches = CacheManager.getKnownCaches();
 
-            if (form.getDebugName() != null)
-            {
-                for (TrackingCache<?, ?> cache : caches)
-                {
-                    if (form.getDebugName().equals(cache.getDebugName()))
-                    {
-                        LOG.info("Purging cache: {}", cache.getDebugName());
-                        cache.clear();
-                    }
-                }
-                ActionURL redirect = getViewContext().cloneActionURL().deleteParameter("debugName");
-                throw new RedirectException(redirect);
-            }
-
             List<CacheStats> cacheStats = new ArrayList<>();
             List<CacheStats> transactionStats = new ArrayList<>();
 
@@ -3235,13 +3233,19 @@ public ModelAndView getView(MemForm form, BindException errors)
 
             HtmlStringBuilder html = HtmlStringBuilder.of();
 
-            html.append(LinkBuilder.labkeyLink("Clear Caches and Refresh", getCachesURL(true, false)));
-            html.append(LinkBuilder.labkeyLink("Refresh", getCachesURL(false, false)));
+            html.append(createHtmlFragment(A(cl("labkey-text-link").at(href, "#").id("clearAllCaches"), "Clear Caches and Refresh")));
+            html.append(createHtmlFragment(A(cl("labkey-text-link").at(href, "#").id("refreshPage"), "Refresh")));
+            html.append(createHtmlFragment(
+                SPAN(at(style, "display:none; margin-left:8px;").id("cacheSpinner"),
+                    SPAN(at(style, "display:inline-block; width:14px; height:14px; border:2px solid #ccc; border-top-color:#333; border-radius:50%; animation:lk-spin 0.7s linear infinite; vertical-align:middle;"))),
+                STYLE("@keyframes lk-spin { to { transform: rotate(360deg); } }"),
+                DIV(cl("labkey-error").at(style, "display:none;").id("cacheError"))
+            ));
 
-            html.unsafeAppend("<br/><br/>\n");
+            html.append(createHtmlFragment(BR(), BR()));
             appendStats(html, "Caches", cacheStats, false);
 
-            html.unsafeAppend("<br/><br/>\n");
+            html.append(createHtmlFragment(BR(), BR()));
             appendStats(html, "Transaction Caches", transactionStats, true);
 
             return new HtmlView(html);
@@ -3251,79 +3255,65 @@ private void appendStats(HtmlStringBuilder html, String title, List<CacheStats>
         {
             List<CacheStats> stats = skipUnusedCaches ?
                 allStats.stream()
-                    .filter(stat->stat.getMaxSize() > 0)
+                    .filter(stat -> stat.getMaxSize() > 0)
                     .collect(Collectors.toCollection((Supplier<List<CacheStats>>) ArrayList::new)) :
                 allStats;
 
             Collections.sort(stats);
 
-            html.unsafeAppend("<p><b>");
-            html.append(title);
-            html.append(" (").append(stats.size()).unsafeAppend(")</b></p>\n");
-
-            html.unsafeAppend("<table class=\"labkey-data-region-legacy labkey-show-borders labkey-data-region-header-lock\">\n");
-            html.unsafeAppend("<tr><td class=\"labkey-column-header\">Debug Name</td>");
-            html.unsafeAppend("<td class=\"labkey-column-header\">Limit</td>");
-            html.unsafeAppend("<td class=\"labkey-column-header\">Max&nbsp;Size</td>");
-            html.unsafeAppend("<td class=\"labkey-column-header\">Current&nbsp;Size</td>");
-            html.unsafeAppend("<td class=\"labkey-column-header\">Gets</td>");
-            html.unsafeAppend("<td class=\"labkey-column-header\">Misses</td>");
-            html.unsafeAppend("<td class=\"labkey-column-header\">Puts</td>");
-            html.unsafeAppend("<td class=\"labkey-column-header\">Expirations</td>");
-            html.unsafeAppend("<td class=\"labkey-column-header\">Evictions</td>");
-            html.unsafeAppend("<td class=\"labkey-column-header\">Removes</td>");
-            html.unsafeAppend("<td class=\"labkey-column-header\">Clears</td>");
-            html.unsafeAppend("<td class=\"labkey-column-header\">Miss Percentage</td>");
-            html.unsafeAppend("<td class=\"labkey-column-header\">Clear</td></tr>");
-
-            long size = 0;
-            long gets = 0;
-            long misses = 0;
-            long puts = 0;
-            long expirations = 0;
-            long evictions = 0;
-            long removes = 0;
-            long clears = 0;
-            int rowCount = 0;
-
-            for (CacheStats stat : stats)
-            {
-                size += stat.getSize();
-                gets += stat.getGets();
-                misses += stat.getMisses();
-                puts += stat.getPuts();
-                expirations += stat.getExpirations();
-                evictions += stat.getEvictions();
-                removes += stat.getRemoves();
-                clears += stat.getClears();
-
-                html.unsafeAppend("<tr class=\"").append(rowCount % 2 == 0 ? "labkey-alternate-row" : "labkey-row").unsafeAppend("\">");
-
-                appendDescription(html, stat.getDescription(), stat.getCreationStackTrace());
-
-                Long limit = stat.getLimit();
-                long maxSize = stat.getMaxSize();
-
-                appendLongs(html, limit, maxSize, stat.getSize(), stat.getGets(), stat.getMisses(), stat.getPuts(), stat.getExpirations(), stat.getEvictions(), stat.getRemoves(), stat.getClears());
-                appendDoubles(html, stat.getMissRatio());
-
-                html.unsafeAppend("<td>").append(LinkBuilder.labkeyLink("Clear", getCacheURL(stat.getDescription()))).unsafeAppend("</td>\n");
-
-                if (null != limit && maxSize >= limit)
-                    html.unsafeAppend("<td><font class=\"labkey-error\">This cache has been limited</font></td>");
-
-                html.unsafeAppend("</tr>\n");
-                rowCount++;
-            }
-
-            double ratio = 0 != gets ? misses / (double)gets : 0;
-            html.unsafeAppend("<tr class=\"labkey-row\"><td><b>Total</b></td>");
-
-            appendLongs(html, null, null, size, gets, misses, puts, expirations, evictions, removes, clears);
-            appendDoubles(html, ratio);
-
-            html.unsafeAppend("</tr>\n");
-            html.unsafeAppend("</table>\n");
+            long size = stats.stream().mapToLong(CacheStats::getSize).sum();
+            long gets = stats.stream().mapToLong(CacheStats::getGets).sum();
+            long misses = stats.stream().mapToLong(CacheStats::getMisses).sum();
+            long puts = stats.stream().mapToLong(CacheStats::getPuts).sum();
+            long expirations = stats.stream().mapToLong(CacheStats::getExpirations).sum();
+            long evictions = stats.stream().mapToLong(CacheStats::getEvictions).sum();
+            long removes = stats.stream().mapToLong(CacheStats::getRemoves).sum();
+            long clears = stats.stream().mapToLong(CacheStats::getClears).sum();
+            double ratio = gets != 0 ? misses / (double) gets : 0;
+
+            AtomicInteger rowCount = new AtomicInteger();
+            html.append(createHtmlFragment(
+                P(B(title + " (" + stats.size() + ")")),
+                TABLE(cl("labkey-data-region-legacy", "labkey-show-borders", "labkey-data-region-header-lock"),
+                    TR(
+                        TD(cl("labkey-column-header"), "Debug Name"),
+                        TD(cl("labkey-column-header"), "Limit"),
+                        TD(cl("labkey-column-header"), "Max Size"),
+                        TD(cl("labkey-column-header"), "Current Size"),
+                        TD(cl("labkey-column-header"), "Gets"),
+                        TD(cl("labkey-column-header"), "Misses"),
+                        TD(cl("labkey-column-header"), "Puts"),
+                        TD(cl("labkey-column-header"), "Expirations"),
+                        TD(cl("labkey-column-header"), "Evictions"),
+                        TD(cl("labkey-column-header"), "Removes"),
+                        TD(cl("labkey-column-header"), "Clears"),
+                        TD(cl("labkey-column-header"), "Miss Percentage"),
+                        TD(cl("labkey-column-header"), "Clear")
+                    ),
+                    stats.stream().map(stat -> {
+                        Long limit = stat.getLimit();
+                        long maxSize = stat.getMaxSize();
+
+                        String clearId = "clear_" + UniqueID.getServerSessionScopedUID();
+                        HttpView.currentPageConfig().addHandler(clearId, "click",
+                            "LABKEY.Admin.Caches.clearSingle(" + PageFlowUtil.jsString(stat.getDescription()) + "); return false;");
+
+                        return TR(cl(rowCount.getAndIncrement() % 2 == 0 ? "labkey-alternate-row" : "labkey-row"),
+                            descriptionCell(stat.getDescription(), stat.getCreationStackTrace()),
+                            longCells(limit, maxSize, stat.getSize(), stat.getGets(), stat.getMisses(), stat.getPuts(), stat.getExpirations(), stat.getEvictions(), stat.getRemoves(), stat.getClears()),
+                            doubleCell(stat.getMissRatio()),
+                            TD(A(cl("labkey-text-link").at(href, "#").id(clearId), "Clear")),
+                            null != limit && maxSize >= limit ? TD(SPAN(cl("labkey-error"), "This cache has been limited")) : null
+                        );
+                    }),
+                    TR(cl("labkey-row"),
+                        TD(B("Total")),
+                        longCells(null, null, size, gets, misses, puts, expirations, evictions, removes, clears),
+                        doubleCell(ratio)
+                        )
+                    )
+                )
+            );
         }
 
         private static final List<String> PREFIXES_TO_SKIP = List.of(
@@ -3334,7 +3324,7 @@ private void appendStats(HtmlStringBuilder html, String title, List<CacheStats>
             "org.labkey.api.module.ModuleResourceCache"
         );
 
-        private void appendDescription(HtmlStringBuilder html, String description, @Nullable StackTraceElement[] creationStackTrace)
+        private Renderable descriptionCell(String description, @Nullable StackTraceElement[] creationStackTrace)
         {
             StringBuilder sb = new StringBuilder();
 
@@ -3346,7 +3336,7 @@ private void appendDescription(HtmlStringBuilder html, String description, @Null
                     // Skip the first few uninteresting stack trace elements to highlight the caller we care about
                     if (trimming)
                     {
-                        if (PREFIXES_TO_SKIP.stream().anyMatch(prefix->element.toString().startsWith(prefix)))
+                        if (PREFIXES_TO_SKIP.stream().anyMatch(prefix -> element.toString().startsWith(prefix)))
                             continue;
 
                         trimming = false;
@@ -3356,30 +3346,31 @@ private void appendDescription(HtmlStringBuilder html, String description, @Null
                 }
             }
 
-            if (!sb.isEmpty())
-            {
-                String message = PageFlowUtil.jsString(sb);
-                String id = "id" + UniqueID.getServerSessionScopedUID();
-                html.append(DOM.createHtmlFragment(TD(A(at(href, "#").id(id), description))));
-                HttpView.currentPageConfig().addHandler(id, "click", "alert(" + message + ");return false;");
-            }
+            if (sb.isEmpty())
+                return TD(description);
+
+            String message = PageFlowUtil.jsString(sb);
+            String id = "id" + UniqueID.getServerSessionScopedUID();
+            HttpView.currentPageConfig().addHandler(id, "click", "alert(" + message + ");return false;");
+            return TD(A(at(href, "#").id(id), description));
         }
 
-        private void appendLongs(HtmlStringBuilder html, Long... stats)
+        private List<Renderable> longCells(Long... stats)
         {
+            List<Renderable> cells = new ArrayList<>();
             for (Long stat : stats)
             {
                 if (null == stat)
-                    html.unsafeAppend("<td>&nbsp;</td>");
+                    cells.add(TD(NBSP));
                 else
-                    html.unsafeAppend("<td align=\"right\">").append(commaf0.format(stat)).unsafeAppend("</td>");
+                    cells.add(TD(at(style, "text-align:right"), commaf0.format(stat)));
             }
+            return cells;
         }
 
-        private void appendDoubles(HtmlStringBuilder html, double... stats)
+        private Renderable doubleCell(double stat)
         {
-            for (double stat : stats)
-                html.unsafeAppend("<td align=\"right\">").append(percent.format(stat)).unsafeAppend("</td>");
+            return TD(at(style, "text-align:right"), percent.format(stat));
         }
 
         @Override
@@ -3390,6 +3381,60 @@ public void addNavTrail(NavTree root)
         }
     }
 
+    @AdminConsoleAction
+    public static class ClearCachesAction extends MutatingApiAction<MemForm>
+    {
+        @Override
+        public ApiResponse execute(MemForm form, BindException errors)
+        {
+            if (form.getDebugName() != null)
+            {
+                for (TrackingCache<?, ?> cache : CacheManager.getKnownCaches())
+                {
+                    if (form.getDebugName().equals(cache.getDebugName()))
+                    {
+                        LOG.info("Purging cache: " + cache.getDebugName());
+                        cache.clear();
+                    }
+                }
+            }
+            else if (form.isClearCaches() && form.isGc())
+            {
+                long before = doGc();
+                doClearCaches();
+                long cacheMemoryUsed = before - doGc();
+                String cacheMemUsed = cacheMemoryUsed > 0 ? FileUtils.byteCountToDisplaySize(cacheMemoryUsed) : "Unknown";
+                LOG.info("Estimate of cache memory used: " + cacheMemUsed);
+                lastCacheMemUsed = cacheMemUsed;
+            }
+            else if (form.isClearCaches())
+            {
+                doClearCaches();
+            }
+            else if (form.isGc())
+            {
+                doGc();
+            }
+            return new ApiSimpleResponse("success", true);
+        }
+
+        private long doGc()
+        {
+            LOG.info("Garbage collecting");
+            System.gc();
+            return Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
+        }
+
+        private void doClearCaches()
+        {
+            LOG.info("Clearing Introspector caches");
+            Introspector.flushCaches();
+            LOG.info("Purging all caches");
+            CacheManager.clearAllKnownCaches();
+            SearchService.get().purgeQueues();
+        }
+    }
+
     @RequiresSiteAdmin
     public class EnvironmentVariablesAction extends SimpleViewAction<Object>
     {
@@ -3722,41 +3767,6 @@ public Object execute(Object o, BindException errors) throws Exception
         }
     }
 
-    public static ActionURL getMemTrackerURL(boolean clearCaches, boolean gc)
-    {
-        ActionURL url = new ActionURL(MemTrackerAction.class, ContainerManager.getRoot());
-
-        if (clearCaches)
-            url.addParameter(MemForm.Params.clearCaches, "1");
-
-        if (gc)
-            url.addParameter(MemForm.Params.gc, "1");
-
-        return url;
-    }
-
-    public static ActionURL getCachesURL(boolean clearCaches, boolean gc)
-    {
-        ActionURL url = new ActionURL(CachesAction.class, ContainerManager.getRoot());
-
-        if (clearCaches)
-            url.addParameter(MemForm.Params.clearCaches, "1");
-
-        if (gc)
-            url.addParameter(MemForm.Params.gc, "1");
-
-        return url;
-    }
-
-    public static ActionURL getCacheURL(String debugName)
-    {
-        ActionURL url = new ActionURL(CachesAction.class, ContainerManager.getRoot());
-
-        url.addParameter(MemForm.Params.debugName, debugName);
-
-        return url;
-    }
-
     private static volatile String lastCacheMemUsed = null;
 
     @AdminConsoleAction
@@ -3766,60 +3776,9 @@ public class MemTrackerAction extends SimpleViewAction<MemForm>
         public ModelAndView getView(MemForm form, BindException errors)
         {
             Set<Object> objectsToIgnore = MemTracker.getInstance().beforeReport();
-
-            boolean gc = form.isGc();
-            boolean cc = form.isClearCaches();
-
-            if (getUser().hasRootAdminPermission() && (gc || cc))
-            {
-                // If both are requested then try to determine and record cache memory usage
-                if (gc && cc)
-                {
-                    // gc once to get an accurate free memory read
-                    long before = gc();
-                    clearCaches();
-                    // gc again now that we cleared caches
-                    long cacheMemoryUsed = before - gc();
-
-                    // Difference could be < 0 if JVM or other threads have performed gc, in which case we can't guesstimate cache memory usage
-                    String cacheMemUsed = cacheMemoryUsed > 0 ? FileUtils.byteCountToDisplaySize(cacheMemoryUsed) : "Unknown";
-                    LOG.info("Estimate of cache memory used: {}", cacheMemUsed);
-                    lastCacheMemUsed = cacheMemUsed;
-                }
-                else if (cc)
-                {
-                    clearCaches();
-                }
-                else
-                {
-                    gc();
-                }
-
-                LOG.info("Cache clearing and garbage collecting complete");
-            }
-
             return new JspView<>("/org/labkey/core/admin/memTracker.jsp", new MemBean(getViewContext().getRequest(), objectsToIgnore));
         }
 
-        /** @return estimated current memory usage, post-garbage collection */
-        private long gc()
-        {
-            LOG.info("Garbage collecting");
-            System.gc();
-            // This is more reliable than relying on just free memory size, as the VM can grow/shrink the heap at will
-            return Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
-        }
-
-        private void clearCaches()
-        {
-            LOG.info("Clearing Introspector caches");
-            Introspector.flushCaches();
-            LOG.info("Purging all caches");
-            CacheManager.clearAllKnownCaches();
-            LOG.info("Purging SearchService queues");
-            SearchService.get().purgeQueues();
-        }
-
         @Override
         public void addNavTrail(NavTree root)
         {
@@ -3830,8 +3789,6 @@ public void addNavTrail(NavTree root)
 
     public static class MemForm
     {
-        private enum Params {clearCaches, debugName, gc}
-
         private boolean _clearCaches = false;
         private boolean _gc = false;
         private String _debugName;
@@ -3924,12 +3881,12 @@ private MemBean(HttpServletRequest request, Set<Object> objectsToIgnore)
             }
 
             // ignore recently allocated
-            long start = ViewServlet.getRequestStartTime(request) - 2000;
+            long start = ViewServlet.getRequestStartTime(request) - 5000;
             references = new ArrayList<>(all.size());
 
             for (HeldReference r : all)
             {
-                if (r.getThreadId() == threadId && r.getAllocationTime() >= start)
+                if (r.getAllocationTime() >= start)
                     continue;
 
                 if (objectsToIgnore.contains(r.getReference()))
@@ -5450,21 +5407,12 @@ public boolean handlePost(ImportFolderForm form, BindException errors) throws Ex
             Container container = getContainer();
             PipeRoot pipelineRoot;
             FileLike pipelineUnzipDir;  // Should be local & writable
-            PipelineUrls pipelineUrlProvider;
 
             if (form.getOrigin() == null)
             {
                 form.setOrigin("Folder");
             }
 
-            // make sure we have a pipeline url provider to use for the success URL redirect
-            pipelineUrlProvider = urlProvider(PipelineUrls.class);
-            if (pipelineUrlProvider == null)
-            {
-                errors.reject("folderImport", "Pipeline url provider does not exist.");
-                return false;
-            }
-
             // make sure that the pipeline root is valid for this container
             pipelineRoot = PipelineService.get().findPipelineRoot(container);
             if (!PipelineService.get().hasValidPipelineRoot(container) || pipelineRoot == null)
@@ -5513,7 +5461,7 @@ public boolean handlePost(ImportFolderForm form, BindException errors) throws Ex
             options.setActivity(ComplianceService.get().getCurrentActivity(getViewContext()));
 
             // finally, create the study or folder import pipeline job
-            _successURL = pipelineUrlProvider.urlBegin(container);
+            _successURL = urlProvider(PipelineUrls.class).urlBegin(container);
             PipelineService.get().runFolderImportJob(container, user, url, archiveXml, fiConfig.originalFileName, pipelineRoot, options);
 
             return !errors.hasErrors();
@@ -10432,6 +10380,10 @@ public ApiResponse execute(DeletedFoldersForm form, BindException errors)
             if (isBlank(form.getContainerPath()))
                 throw new NotFoundException();
             Container container = ContainerManager.getForPath(form.getContainerPath());
+            if (!container.hasPermission(getUser(), AdminPermission.class))
+            {
+                throw new UnauthorizedException();
+            }
             for (String tabName : form.getResurrectFolders())
             {
                 ContainerManager.clearContainerTabDeleted(container, tabName, form.getNewFolderType());
@@ -11803,15 +11755,15 @@ private static boolean saveProjectSettings(Container c, User user, ProjectSettin
             }
         });
 
-        boolean noErrors = !saveFolderSettings(c, user, props, form, errors);
+        boolean success = saveFolderSettings(c, user, props, form, errors);
 
-        if (noErrors)
+        if (success)
         {
             // Bump the look & feel revision so browsers retrieve the new theme stylesheet
             WriteableAppProps.incrementLookAndFeelRevisionAndSave();
         }
 
-        return noErrors;
+        return success;
     }
 
     private static void setProperty(boolean inherited, Runnable clear, Runnable set)
@@ -12052,7 +12004,7 @@ public static class LookAndFeelBean
         public final HtmlString customColumnRestrictionHelpLink = new HelpTopic("chartTrouble").getSimpleLinkHtml("more info...");
     }
 
-    @RequiresPermission(AdminPermission.class)
+    @RequiresPermission(SiteAdminPermission.class)
     public static class AdjustSystemTimestampsAction extends FormViewAction<AdjustTimestampsForm>
     {
         @Override
diff --git a/core/src/org/labkey/core/admin/memTracker.jsp b/core/src/org/labkey/core/admin/memTracker.jsp
index 9d70d5abf14..3945a017e6f 100644
--- a/core/src/org/labkey/core/admin/memTracker.jsp
+++ b/core/src/org/labkey/core/admin/memTracker.jsp
@@ -26,8 +26,16 @@
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page import="org.labkey.core.admin.AdminController" %>
 <%@ page import="org.labkey.core.admin.AdminController.MemBean" %>
+<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page import="java.text.DecimalFormat" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
+<%!
+    @Override
+    public void addClientDependencies(ClientDependencies dependencies)
+    {
+        dependencies.add("admin/caches.js");
+    }
+%>
 <%
     JspView<MemBean> me = HttpView.currentView();
     MemBean bean = me.getModelBean();
@@ -45,11 +53,16 @@
 %>
 <% if (hasAdminPerm) { %>
 <p>
-    <%=link("Clear Caches, GC and Refresh", AdminController.getMemTrackerURL(true, true))%>
-    <%=link("GC and Refresh", AdminController.getMemTrackerURL(false, true))%>
-    <%=link("Refresh", AdminController.getMemTrackerURL(false, false))%>
+    <a href="#" id="clearCachesGc" class="labkey-text-link">Clear Caches, GC and Refresh</a>
+    <a href="#" id="gcOnly" class="labkey-text-link">GC and Refresh</a>
+    <a href="#" id="refreshPage" class="labkey-text-link">Refresh</a>
     <% if (getUser().hasSiteAdminPermission()) { %> <%=link("Memory Stress Test", new ActionURL(AdminController.MemoryStressTestAction.class, ContainerManager.getRoot()))%> <% } %>
+    <span id="cacheSpinner" style="display:none; margin-left:8px;">
+        <span style="display:inline-block; width:14px; height:14px; border:2px solid #ccc; border-top-color:#333; border-radius:50%; animation:lk-spin 0.7s linear infinite; vertical-align:middle;"></span>
+    </span>
+    <style>@keyframes lk-spin { to { transform: rotate(360deg); } }</style>
 </p>
+<div id="cacheError" class="labkey-error" style="display:none;"></div>
 <% } %>
 <table class="labkey-wp">
     <tr class="labkey-wp-header">
diff --git a/core/webapp/admin/caches.js b/core/webapp/admin/caches.js
new file mode 100644
index 00000000000..b9dcd43b90a
--- /dev/null
+++ b/core/webapp/admin/caches.js
@@ -0,0 +1,81 @@
+LABKEY.Admin = LABKEY.Admin || {};
+
+LABKEY.Admin.Caches = new function() {
+    var API_URL = LABKEY.ActionURL.buildURL('admin', 'clearCaches');
+
+    function showSpinner() {
+        var el = document.getElementById('cacheSpinner');
+        if (el) el.style.display = 'inline';
+    }
+
+    function hideSpinner() {
+        var el = document.getElementById('cacheSpinner');
+        if (el) el.style.display = 'none';
+    }
+
+    function showError(msg) {
+        hideSpinner();
+        var el = document.getElementById('cacheError');
+        if (el) {
+            el.textContent = msg || 'An error occurred. Please try again.';
+            el.style.display = 'block';
+        }
+    }
+
+    function hideError() {
+        var el = document.getElementById('cacheError');
+        if (el) el.style.display = 'none';
+    }
+
+    function doPost(params) {
+        hideError();
+        showSpinner();
+        LABKEY.Ajax.request({
+            url: API_URL,
+            method: 'POST',
+            params: params,
+            success: reloadPage,
+            failure: function(response) {
+                var msg = 'Request failed.';
+                try {
+                    var json = JSON.parse(response.responseText);
+                    if (json && json.exception) msg = json.exception;
+                } catch (e) { /* ignore */ }
+                showError(msg);
+            }
+        });
+    }
+
+    function reloadPage() { window.location.reload(); }
+
+    // clearSingle is called from inline onclick handlers (addHandler), so must be defined immediately.
+    this.clearSingle = function(debugName) {
+        doPost({ debugName: debugName });
+    };
+
+    // Bind button handlers once the DOM is ready — elements don't exist yet when this script runs.
+    window.addEventListener('DOMContentLoaded', function() {
+        function bindIfPresent(id, params) {
+            var el = document.getElementById(id);
+            if (el) {
+                el.addEventListener('click', function(e) {
+                    e.preventDefault();
+                    el.disabled = true;
+                    doPost(params);
+                });
+            }
+        }
+
+        bindIfPresent('clearAllCaches', { clearCaches: true });
+        bindIfPresent('clearCachesGc', { clearCaches: true, gc: 1 });
+        bindIfPresent('gcOnly', { gc: true });
+
+        const refreshEl = document.getElementById('refreshPage');
+        if (refreshEl) {
+            refreshEl.addEventListener('click', function(e) {
+                e.preventDefault();
+                reloadPage();
+            });
+        }
+    });
+};
diff --git a/core/webapp/vis/src/plot.js b/core/webapp/vis/src/plot.js
index 8210eba853e..4e4d4177431 100644
--- a/core/webapp/vis/src/plot.js
+++ b/core/webapp/vis/src/plot.js
@@ -2272,31 +2272,37 @@ boxPlot.render();
             };
         }
 
-        // Issue 23626: map line/point color based on legend data
-        if (config.legendData && config.properties.color && !config.properties.colorRange) {
-            var legendColorMap = {};
-            for (var i = 0; i < config.legendData.length; i++) {
-                if (config.legendData[i].name) {
-                    legendColorMap[config.legendData[i].name] = config.legendData[i].color;
+        // Issue 23626: map line/point color based on explicit colorMap property or legendData name entries
+        if (config.properties.color && !config.properties.colorRange) {
+            var legendColorMap;
+            if (config.properties.colorMap) {
+                legendColorMap = config.properties.colorMap;
+            } else if (config.legendData) {
+                legendColorMap = {};
+                for (var i = 0; i < config.legendData.length; i++) {
+                    if (config.legendData[i].name) {
+                        legendColorMap[config.legendData[i].name] = config.legendData[i].color;
+                    }
                 }
             }
 
-            if (config.qcPlotType === LABKEY.vis.TrendingLinePlotType.CUSUM) {
-                config.scales.color = {
-                    scale: function(group) {
-                        var normalizedGroup = group.replace('CUSUMmN', 'CUSUMm').replace('CUSUMmP', 'CUSUMm');
-                        normalizedGroup = normalizedGroup.replace('CUSUMvN', 'CUSUMv').replace('CUSUMvP', 'CUSUMv');
-                        return legendColorMap[normalizedGroup];
-                    }
-                };
-            }
-            else
-            {
-                config.scales.color = {
-                    scale: function(group) {
-                        return legendColorMap[group];
-                    }
-                };
+            if (legendColorMap) {
+                if (config.qcPlotType === LABKEY.vis.TrendingLinePlotType.CUSUM) {
+                    config.scales.color = {
+                        scale: function(group) {
+                            var normalizedGroup = group.replace('CUSUMmN', 'CUSUMm').replace('CUSUMmP', 'CUSUMm');
+                            normalizedGroup = normalizedGroup.replace('CUSUMvN', 'CUSUMv').replace('CUSUMvP', 'CUSUMv');
+                            return legendColorMap[normalizedGroup];
+                        }
+                    };
+                }
+                else {
+                    config.scales.color = {
+                        scale: function(group) {
+                            return legendColorMap[group];
+                        }
+                    };
+                }
             }
         }
 
diff --git a/experiment/src/org/labkey/experiment/XarExporter.java b/experiment/src/org/labkey/experiment/XarExporter.java
index 700cd21182d..c2159405c05 100644
--- a/experiment/src/org/labkey/experiment/XarExporter.java
+++ b/experiment/src/org/labkey/experiment/XarExporter.java
@@ -70,6 +70,7 @@
 import org.labkey.api.util.DateUtil;
 import org.labkey.api.util.FileUtil;
 import org.labkey.api.util.Pair;
+import org.labkey.api.util.logging.LogHelper;
 import org.labkey.data.xml.DerivationDataScopeTypes;
 import org.labkey.experiment.api.Data;
 import org.labkey.experiment.api.DataInput;
@@ -85,8 +86,6 @@
 import org.labkey.experiment.xar.XarExportSelection;
 
 import javax.xml.namespace.QName;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
@@ -120,6 +119,7 @@
  */
 public class XarExporter
 {
+    private static final Logger DEFAULT_LOG = LogHelper.getLogger(XarExporter.class, "XAR (experiment archive) exporting");
     private final URLRewriter _urlRewriter;
     private final User _user;
     private final String _fileRootPath;
@@ -153,7 +153,7 @@ public class XarExporter
     private final Map<Long, String> _rootMaterialRowIdsToLSIDs = new LRUMap<>(1_000);
 
     private final LSIDRelativizer.RelativizedLSIDs _relativizedLSIDs;
-    private Logger _log;
+    private final Logger _log;
 
     private boolean _includeXML = true;
 
@@ -165,7 +165,7 @@ public class XarExporter
     AssayProvider.XarCallbacks assayCallbacks = null;
 
 
-    public XarExporter(LSIDRelativizer.RelativizedLSIDs relativizedLSIDs, URLRewriter urlRewriter, User user, Container container)
+    private XarExporter(LSIDRelativizer.RelativizedLSIDs relativizedLSIDs, URLRewriter urlRewriter, User user, Container container, Logger log)
     {
         // UNDONE: Is it ok to share the relativizedLSIDs across XarExporters and tsv writers?
         _relativizedLSIDs = relativizedLSIDs;
@@ -175,11 +175,12 @@ public XarExporter(LSIDRelativizer.RelativizedLSIDs relativizedLSIDs, URLRewrite
 
         _document = ExperimentArchiveDocument.Factory.newInstance();
         _archive = _document.addNewExperimentArchive();
+        _log = log == null ? DEFAULT_LOG : log;
     }
 
     public XarExporter(LSIDRelativizer lsidRelativizer, URLRewriter urlRewriter, User user, Container container)
     {
-        this(new LSIDRelativizer.RelativizedLSIDs(lsidRelativizer), urlRewriter, user, container);
+        this(new LSIDRelativizer.RelativizedLSIDs(lsidRelativizer), urlRewriter, user, container, DEFAULT_LOG);
     }
 
     public XarExporter(LSIDRelativizer lsidRelativizer, XarExportSelection selection, User user, String xarXmlFileName, Logger log, Container container) throws ExperimentException
@@ -189,8 +190,7 @@ public XarExporter(LSIDRelativizer lsidRelativizer, XarExportSelection selection
 
     public XarExporter(LSIDRelativizer.RelativizedLSIDs relativizedLSIDs, XarExportSelection selection, User user, String xarXmlFileName, Logger log, Container container) throws ExperimentException
     {
-        this(relativizedLSIDs, selection.createURLRewriter(), user, container);
-        _log = log;
+        this(relativizedLSIDs, selection.createURLRewriter(), user, container, log);
 
         selection.addContent(this);
 
@@ -201,14 +201,6 @@ public XarExporter(LSIDRelativizer.RelativizedLSIDs relativizedLSIDs, XarExportS
         setFileIncludes(selection.isIncludeXarXml());
     }
 
-    private void logProgress(String message)
-    {
-        if (_log != null)
-        {
-            _log.info(message);
-        }
-    }
-
     public void setFileIncludes(boolean xarXML)
     {
         _includeXML = xarXML;
@@ -225,7 +217,7 @@ public void addExpData(ExpData data) throws ExperimentException
         {
             return;
         }
-        logProgress("Adding experiment data " + data.getRowId());
+        _log.debug("Adding experiment data {}", data.getRowId());
         _expDataIDs.add(data.getRowId());
 
         ArchiveURLRewriter u = (ArchiveURLRewriter)_urlRewriter;
@@ -240,7 +232,7 @@ public void addExperimentRun(ExpRun run) throws ExperimentException
         {
             return;
         }
-        logProgress("Adding experiment run " + run.getLSID());
+        _log.debug("Adding experiment run {}", run.getLSID());
         _experimentRunLSIDs.add(run.getLSID());
 
         ExpExperiment batch = run.getBatch();
@@ -591,7 +583,7 @@ private boolean isDefaultCpasType(String cpasType, @NotNull String defaultType)
 
     private void populateMaterial(MaterialBaseType xMaterial, ExpMaterial material) throws ExperimentException
     {
-        logProgress("Adding material " + material.getLSID());
+        _log.debug("Adding material {}", material.getLSID());
         addSampleType(material.getCpasType());
         xMaterial.setAbout(_relativizedLSIDs.relativize(material.getLSID()));
         xMaterial.setCpasType(isDefaultCpasType(material.getCpasType(), ExpMaterial.DEFAULT_CPAS_TYPE) ? ExpMaterial.DEFAULT_CPAS_TYPE : _relativizedLSIDs.relativize(material.getCpasType()));
@@ -984,7 +976,7 @@ private PropertyCollectionType addOriginalURLProperty(PropertyCollectionType pro
 
     private void populateData(DataBaseType xData, ExpData data, @Nullable String role, ExpRun run) throws ExperimentException
     {
-        logProgress("Adding data " + data.getLSID());
+        _log.debug("Adding data {}", data.getLSID());
         xData.setName(data.getName());
         xData.setAbout(_relativizedLSIDs.relativize(data));
         xData.setCpasType(isDefaultCpasType(data.getCpasType(), ExpData.DEFAULT_CPAS_TYPE) ? ExpData.DEFAULT_CPAS_TYPE : _relativizedLSIDs.relativize(data.getCpasType()));
@@ -1013,7 +1005,7 @@ public void addProtocol(ExpProtocol protocol, boolean includeChildren) throws Ex
         {
             return;
         }
-        logProgress("Adding protocol " + protocol.getLSID());
+        _log.debug("Adding protocol {}", protocol.getLSID());
         _protocolLSIDs.add(protocol.getLSID());
 
         ExperimentArchiveType.ProtocolDefinitions protocolDefs = _archive.getProtocolDefinitions();
@@ -1249,7 +1241,7 @@ public void addExperiment(ExpExperimentImpl exp) throws ExperimentException
         {
             return;
         }
-        logProgress("Adding experiment " + experiment.getLSID());
+        _log.debug("Adding experiment {}", experiment.getLSID());
         Set<String> runLsids = new HashSet<>();
         for (ExpRun expRun : exp.getRuns())
         {
@@ -1421,7 +1413,7 @@ private PropertyCollectionType getProperties(Map<String, ObjectProperty> propert
                         }
                         break;
                     default:
-                        logProgress("Warning: skipping export of " + value.getName() + " -- unknown type " + value.getPropertyType());
+                        _log.warn("Skipping export of {} -- unknown type {}", value.getName(), value.getPropertyType());
                 }
             }
         }
@@ -1515,7 +1507,7 @@ public void writeAsArchive(OutputStream out) throws IOException, ExperimentExcep
                 {
                     ZipEntry xmlEntry = new ZipEntry(_xarXmlFileName);
                     zOut.putNextEntry(xmlEntry);
-                    logProgress("Adding XAR XML to archive");
+                    _log.info("Adding XAR XML to archive");
                     dumpXML(zOut);
                     zOut.closeEntry();
                 }
@@ -1524,7 +1516,7 @@ public void writeAsArchive(OutputStream out) throws IOException, ExperimentExcep
                 {
                     if (fileInfo.hasContentToExport())
                     {
-                        logProgress("Adding data file to archive: " + fileInfo.getName());
+                        _log.debug("Adding data file to archive: {}", fileInfo.getName());
                         ZipEntry fileEntry = new ZipEntry(fileInfo.getName());
                         zOut.putNextEntry(fileEntry);
 
@@ -1548,47 +1540,6 @@ public void writeAsArchive(OutputStream out) throws IOException, ExperimentExcep
         }
     }
 
-    public void writeAsDirectory(File dir) throws IOException
-    {
-        try
-        {
-            if (_includeXML)
-            {
-                File xmlEntry = FileUtil.appendName(dir, _xarXmlFileName);
-                logProgress("Writing XAR XML file");
-                try (FileOutputStream os = new FileOutputStream(xmlEntry))
-                {
-                    dumpXML(os);
-                }
-            }
-
-            for (URLRewriter.FileInfo fileInfo : _urlRewriter.getFileInfos())
-            {
-                if (fileInfo.hasContentToExport())
-                {
-                    logProgress("Adding data file to archive: " + fileInfo.getName());
-                    File fileEntry = new File(dir, fileInfo.getName());
-                    FileUtil.mkdirs(fileEntry.getParentFile());
-                    try (FileOutputStream os = new FileOutputStream(fileEntry))
-                    {
-                        fileInfo.writeFile(os);
-                    }
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            // insert the stack trace into the zip file
-            File errorEntry = FileUtil.appendName(dir,"error.log");
-
-            try (FileOutputStream os = new FileOutputStream(errorEntry); PrintStream ps = new PrintStream(os))
-            {
-                ps.println("Failed to complete export of the XAR file: ");
-                e.printStackTrace(ps);
-            }
-        }
-    }
-
     private ContactType getContactType(String parentLSID, Container parentContainer) throws ExperimentException
     {
         Map<String, Object> parentProperties = getProperties(parentContainer, parentLSID);
diff --git a/experiment/src/org/labkey/experiment/pipeline/XarGeneratorTask.java b/experiment/src/org/labkey/experiment/pipeline/XarGeneratorTask.java
index e7ac1fddd5f..a1aadd46225 100644
--- a/experiment/src/org/labkey/experiment/pipeline/XarGeneratorTask.java
+++ b/experiment/src/org/labkey/experiment/pipeline/XarGeneratorTask.java
@@ -71,7 +71,7 @@ public Factory()
         }
 
         @Override
-        public PipelineJob.Task createTask(PipelineJob job)
+        public XarGeneratorTask createTask(PipelineJob job)
         {
             return new XarGeneratorTask(this, job);
         }
diff --git a/study/src/org/labkey/study/controllers/security/SecurityController.java b/study/src/org/labkey/study/controllers/security/SecurityController.java
index 0785f7377f2..643d2ae92ed 100644
--- a/study/src/org/labkey/study/controllers/security/SecurityController.java
+++ b/study/src/org/labkey/study/controllers/security/SecurityController.java
@@ -469,7 +469,7 @@ public List<NavTree> getTabList()
         }
 
         @Override
-        public HttpView getTabView(String tabId)
+        public HttpView<?> getTabView(String tabId)
         {
             if (TAB_STUDY.equals(tabId))
             {
@@ -559,9 +559,7 @@ public void addNavTrail(NavTree root)
                 if (getContainer().hasPermission(getUser(), AdminPermission.class))
                     root.addChild("Manage Views", urlProvider(ReportUrls.class).urlManageViews(getContainer()).getLocalURIString());
             }
-            catch (Exception e)
-            {
-            }
+            catch (Exception _) {}
             root.addChild("Report and View Permissions");
         }
     }
@@ -701,7 +699,7 @@ public void setRemove(Integer remove)
 
         public int getAdd()
         {
-            return add == null ? 0 : remove.intValue();
+            return add == null ? 0 : add.intValue();
         }
 
         public void setAdd(Integer add)
@@ -730,9 +728,9 @@ public String getTabId()
         }
     }
 
-    static class Overview extends WebPartView
+    static class Overview extends WebPartView<StudyImpl>
     {
-        private final HttpView _vbox;
+        private final HttpView<?> _vbox;
 
         Overview(StudyImpl study)
         {
@@ -773,7 +771,7 @@ static class Overview extends WebPartView
 
 
         @Override
-        protected void renderView(Object model, HtmlWriter out) throws Exception
+        protected void renderView(StudyImpl model, HtmlWriter out) throws Exception
         {
             include(_vbox, out.unwrap());
         }
@@ -783,7 +781,7 @@ protected void renderView(Object model, HtmlWriter out) throws Exception
     public static class StudySecurityViewFactory implements SecurityManager.ViewFactory
     {
         @Override
-        public HttpView createView(ViewContext context)
+        public StudySecurityPermissionsView createView(ViewContext context)
         {
             if (null != BaseStudyController.getStudy(context.getContainer()))
                 return new StudySecurityPermissionsView();