diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89f70ac0..799b3d0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -515,9 +515,11 @@ install(DIRECTORY include/sta  DESTINATION include)
 
 ################################################################
 
-add_custom_target(tags etags -o TAGS
+add_custom_target(sta_tags etags -o TAGS
   ${STA_SOURCE}
-  */*.hh include/sta/*.hh
-  ${STA_TCL_FILES} ${SWIG_TCL_FILES}
+  */*.hh
+  include/sta/*.hh
+  ${STA_TCL_FILES}
+  ${SWIG_TCL_FILES}
   WORKING_DIRECTORY ${STA_HOME}
   )
diff --git a/search/Bfs.cc b/search/Bfs.cc
index 4d8ff872..9641e93f 100644
--- a/search/Bfs.cc
+++ b/search/Bfs.cc
@@ -189,6 +189,8 @@ BfsIterator::visitParallel(Level to_level,
 	  level_vertices.clear();
 	}
       }
+      for (VertexVisitor *visitor : visitors)
+	delete visitor;
     }
   }
   return visit_count;