diff --git a/CalPatRec/CMakeLists.txt b/CalPatRec/CMakeLists.txt
index 50de48e302..e5845962dc 100644
--- a/CalPatRec/CMakeLists.txt
+++ b/CalPatRec/CMakeLists.txt
@@ -2,6 +2,7 @@ cet_make_library(
     SOURCE
       src/CalHelixFinderAlg.cc
       src/CalHelixFinderData.cc
+      src/ChannelID.cc
       src/DeltaCandidate.cc
       src/DeltaFinderAlg.cc
       src/DeltaFinderAlg_findProtons.cc
@@ -26,6 +27,18 @@ cet_make_library(
       ROOT::Physics
 )
 
+cet_build_plugin(AgnosticHelixFinderDiag art::tool
+    REG_SOURCE src/AgnosticHelixFinderDiag_tool.cc
+    LIBRARIES REG
+      Offline::CalPatRec
+)
+
+cet_build_plugin(AgnosticHelixFinder art::module
+    REG_SOURCE src/AgnosticHelixFinder_module.cc
+    LIBRARIES REG
+        Offline::CalPatRec
+)
+
 cet_build_plugin(CalHelixFinder art::module
     REG_SOURCE src/CalHelixFinder_module.cc
     LIBRARIES REG
@@ -192,6 +205,12 @@ cet_build_plugin(PhiClusterFinderDiag art::tool
       Offline::RecoDataProducts
 )
 
+cet_build_plugin(TZClusterFilter art::module
+    REG_SOURCE src/TZClusterFilter_module.cc
+    LIBRARIES REG
+        Offline::CalPatRec
+)
+
 cet_build_plugin(TZClusterFinderDiag art::tool
     REG_SOURCE src/TZClusterFinderDiag_tool.cc
     LIBRARIES REG
diff --git a/EventGenerator/CMakeLists.txt b/EventGenerator/CMakeLists.txt
index 9047bd7bee..c4b5c5657f 100644
--- a/EventGenerator/CMakeLists.txt
+++ b/EventGenerator/CMakeLists.txt
@@ -131,6 +131,12 @@ cet_build_plugin(DecayInOrbitWeight art::module
       Offline::SeedService
 )
 
+cet_build_plugin(deltaFunctionGun art::module
+    REG_SOURCE src/deltaFunctionGun_module.cc
+    LIBRARIES REG
+        Offline::EventGenerator
+)
+
 cet_build_plugin(EplusFromStoppedPion art::module
     REG_SOURCE src/EplusFromStoppedPion_module.cc
     LIBRARIES REG
diff --git a/GeneralUtilities/CMakeLists.txt b/GeneralUtilities/CMakeLists.txt
index 78894bc898..988e2eba06 100644
--- a/GeneralUtilities/CMakeLists.txt
+++ b/GeneralUtilities/CMakeLists.txt
@@ -32,6 +32,7 @@ cet_make_library(
       ROOT::MathMore
       ROOT::GenVector
       Boost::headers
+      Boost::filesystem
       cetlib_except::cetlib_except
       CLHEP::CLHEP
       fhiclcpp::fhiclcpp
diff --git a/Mu2eG4/CMakeLists.txt b/Mu2eG4/CMakeLists.txt
index 1f8760a696..7c10cd1c6a 100644
--- a/Mu2eG4/CMakeLists.txt
+++ b/Mu2eG4/CMakeLists.txt
@@ -55,7 +55,6 @@ cet_make_library(
       src/generateFieldMap.cc
       src/getPhysicalVolumeOrThrow.cc
       src/HelicalProtonAbsorber.cc
-      src/InitEnvToolBase.cc
       src/MaterialFinder.cc
       src/MTMasterThread.cc
       src/Mu2eG4ActionInitialization.cc
@@ -158,6 +157,12 @@ cet_make_library(
       Geant4::G4error_propagation
 )
 
+cet_build_plugin(ConstructEnvEmpty art::tool
+    REG_SOURCE src/ConstructEnvEmpty_tool.cc
+    LIBRARIES REG
+        Offline::Mu2eG4
+)
+
 cet_build_plugin(IonProducer art::module
     REG_SOURCE src/IonProducer_module.cc
     LIBRARIES REG
diff --git a/TrkReco/CMakeLists.txt b/TrkReco/CMakeLists.txt
index 4a6a682d7b..4880baf578 100644
--- a/TrkReco/CMakeLists.txt
+++ b/TrkReco/CMakeLists.txt
@@ -33,6 +33,12 @@ cet_make_library(
       Offline::TrackerGeom
 )
 
+cet_build_plugin(MergeKalSeeds art::module
+    REG_SOURCE src/MergeKalSeeds_module.cc
+    LIBRARIES REG
+      Offline::TrkReco
+)
+
 cet_build_plugin(MergeHelices art::module
     REG_SOURCE src/MergeHelices_module.cc
     LIBRARIES REG