diff --git a/flow/src/org/labkey/flow/controllers/FlowController.java b/flow/src/org/labkey/flow/controllers/FlowController.java
index a612ff525..62b5baec3 100644
--- a/flow/src/org/labkey/flow/controllers/FlowController.java
+++ b/flow/src/org/labkey/flow/controllers/FlowController.java
@@ -361,7 +361,7 @@ public void addNavTrail(NavTree root)
     }
 
     @RequiresPermission(ReadPermission.class)
-    public class SavePreferencesAction extends SimpleViewAction
+    public class SavePreferencesAction extends SimpleViewAction<Object>
     {
         @Override
         public ModelAndView getView(Object o, BindException errors) throws Exception
diff --git a/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java b/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java
index 8089be37c..d4ce6ff2e 100644
--- a/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java
+++ b/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java
@@ -378,10 +378,10 @@ protected ModelAndView uploadRuns(ImportRunsForm form, BindException errors) thr
         {
             if (!form.isConfirm())
             {
-                URLHelper url = form.getReturnUrlHelper();
+                ActionURL url = form.getReturnActionURL();
                 if (url == null)
                     url = new ActionURL(BeginAction.class, getContainer());
-                return HttpView.redirect(url);
+                return HttpView.redirect(url, false);
             }
 
             validatePipeline();