diff --git a/api/src/org/labkey/api/pipeline/PipelineProtocolFactory.java b/api/src/org/labkey/api/pipeline/PipelineProtocolFactory.java
index af7fc03ad7c..50029de1656 100644
--- a/api/src/org/labkey/api/pipeline/PipelineProtocolFactory.java
+++ b/api/src/org/labkey/api/pipeline/PipelineProtocolFactory.java
@@ -19,7 +19,6 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.xmlbeans.XmlOptions;
 import org.fhcrc.cpas.pipeline.protocol.xml.PipelineProtocolPropsDocument;
-import org.labkey.api.data.Container;
 import org.labkey.api.util.FileUtil;
 import org.labkey.api.util.NetworkDrive;
 
@@ -64,11 +63,7 @@ public static File locateProtocolRootDir(File rootDir, File systemDir)
 
     public T load(PipeRoot root, String name, boolean archived) throws IOException
     {
-        return load(getProtocolFile(root, name, archived), root.getContainer());
-    }
-
-    protected T load(Path file, Container container) throws IOException
-    {
+        Path file = getProtocolFile(root, name, archived);
         try
         {
             Map<String, String> mapNS = new HashMap<>();
@@ -164,7 +159,7 @@ public String[] getProtocolNames(PipeRoot root, Path dirData, boolean archived)
             }
         }
 
-        String[] vals = setNames.toArray(new String[setNames.size()]);
+        String[] vals = setNames.toArray(new String[0]);
         Arrays.sort(vals, String.CASE_INSENSITIVE_ORDER);
         return vals;
     }
diff --git a/pipeline/src/org/labkey/pipeline/api/PipelineServiceImpl.java b/pipeline/src/org/labkey/pipeline/api/PipelineServiceImpl.java
index e4e1887864b..614c486cfef 100644
--- a/pipeline/src/org/labkey/pipeline/api/PipelineServiceImpl.java
+++ b/pipeline/src/org/labkey/pipeline/api/PipelineServiceImpl.java
@@ -896,7 +896,7 @@ public PathAnalysisProperties getFileAnalysisProperties(Container c, String task
         if (pr == null || !pr.isValid())
             throw new NotFoundException();
 
-        Path dirData = pr.getRootNioPath();
+        Path dirData = null;
         if (path != null)
         {
             dirData = pr.resolveToNioPath(path);