diff --git a/ehr/api-src/org/labkey/api/ehr/demographics/HousingDemographicsProvider.java b/ehr/api-src/org/labkey/api/ehr/demographics/HousingDemographicsProvider.java
index aa51a0be5..a9649c35e 100644
--- a/ehr/api-src/org/labkey/api/ehr/demographics/HousingDemographicsProvider.java
+++ b/ehr/api-src/org/labkey/api/ehr/demographics/HousingDemographicsProvider.java
@@ -47,8 +47,6 @@ protected Collection<FieldKey> getFieldKeys()
         keys.add(FieldKey.fromString("date"));
         keys.add(FieldKey.fromString("cond"));
         keys.add(FieldKey.fromString("reason"));
-
-        //cnprc
         keys.add(FieldKey.fromString("location"));
 
         return keys;
diff --git a/ehr/src/org/labkey/ehr/EHRController.java b/ehr/src/org/labkey/ehr/EHRController.java
index 6ea62c1f4..c7805f3d2 100644
--- a/ehr/src/org/labkey/ehr/EHRController.java
+++ b/ehr/src/org/labkey/ehr/EHRController.java
@@ -383,7 +383,7 @@ public ModelAndView getView(EHRQueryForm form, BindException errors)
 
             ActionURL url = getViewContext().getActionURL().clone();
 
-            if (keyField != null)
+            if (keyField != null && ti.getUpdateService() != null)
             {
                 String detailsStr;
                 String importStr;
@@ -1427,7 +1427,14 @@ public Object execute(PopulateLookupsForm form, BindException errors) throws Exc
                 return null;
 
             List<String> lookups = new ArrayList<>();
-            lookups.add("All");
+
+            // This is too dangerous to leave in production so only include it if a manifest is provided as a URL parameter
+            // such as in automated testing
+            if (form.getManifest() != null)
+            {
+                lookups.add("All");
+            }
+
             lookups.add("lookup_sets");
 
             BufferedReader reader = Readers.getReader(_lookupsManifest.getInputStream());
diff --git a/ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java b/ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java
index b15e8d90b..a61293b5b 100644
--- a/ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java
+++ b/ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java
@@ -1216,7 +1216,7 @@ private void customizeAnimalTable(AbstractTableInfo ds)
         ds.addColumn(col20);
 
         var col8 = getWrappedIdCol(us, ds, "CageClass", "demographicsCageClass");
-        col8.setLabel("Required Case Size");
+        col8.setLabel("Required Cage Size");
         col8.setDescription("Calculates the cage size necessary for this animal, based on weight using The Guide requirements");
         ds.addColumn(col8);