diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java
index 23e300013..fd333560b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java
@@ -537,13 +537,14 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
         List<String> actions = new ArrayList<String>();
         
         Model dModel = getOntModelSelector().getDisplayModel();
+        dModel.enterCriticalSection(false);
         try{
             QueryExecution qe = 
                 QueryExecutionFactory.create( requiredActionsQuery, dModel, initialBindings);
             actions = executeQueryToList( qe );
             qe.close();
         }finally{
-            dModel.enterCriticalSection(false);
+            dModel.leaveCriticalSection();
         }
         return actions;            
     }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/loader/FreemarkerTemplateLoader.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/loader/FreemarkerTemplateLoader.java
index 2ae556862..0bef38b30 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/loader/FreemarkerTemplateLoader.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/freemarker/loader/FreemarkerTemplateLoader.java
@@ -285,7 +285,7 @@ public class FreemarkerTemplateLoader implements TemplateLoader {
 		}
 
 		public boolean fileQualifies(Path path) {
-			return Files.isRegularFile(path) && Files.isReadable(path);
+			return Files.isReadable(path) && !Files.isDirectory(path);
 		}
 
 		public SortedSet<PathPieces> getMatches() {