diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73e2e9eecb..5c2ac76a1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,6 +33,7 @@ cet_set_compiler_flags(DIAGS VIGILANT
              -Wreorder
 )
 
+
 if(DEFINED Offline_UPS_QUALIFIER_STRING)
   string(FIND ${Offline_UPS_QUALIFIER_STRING} "trig" TRIG_BUILD)
   # TRIG_BUILD will be -1 if trig qualifier not found
@@ -43,7 +44,12 @@ if(DEFINED Offline_UPS_QUALIFIER_STRING)
   endif()
 endif()
 
-message("WITH_G4 SET TO ${WITH_G4}")
+if(NOT DEFINED WITH_G4)
+  message("WITH_G4 UNDEFINED, SET TO FALSE")
+  set(WITH_G4 FALSE)
+else()
+  message("WITH_G4 SET TO ${WITH_G4}")
+endif()
 
 # Create a variable to hold optional Online libraries
 find_package(artdaq)
diff --git a/Filters/CMakeLists.txt b/Filters/CMakeLists.txt
index 36de3d5376..6243f5aabb 100644
--- a/Filters/CMakeLists.txt
+++ b/Filters/CMakeLists.txt
@@ -237,6 +237,14 @@ cet_build_plugin(StrawDigiMCFilter art::module
       Offline::MCDataProducts
 )
 
+cet_build_plugin(StrawGasStepFilter art::module
+    REG_SOURCE src/StrawGasStepFilter_module.cc
+    LIBRARIES REG
+      Offline::MCDataProducts
+      Offline::ProditionsService
+      Offline::TrackerConditions
+)
+
 cet_build_plugin(TrackerStepPointFilter art::module
     REG_SOURCE src/TrackerStepPointFilter_module.cc
     LIBRARIES REG
diff --git a/TrackerMC/CMakeLists.txt b/TrackerMC/CMakeLists.txt
index 90b8d1d0f8..bc2414386e 100644
--- a/TrackerMC/CMakeLists.txt
+++ b/TrackerMC/CMakeLists.txt
@@ -55,6 +55,15 @@ cet_build_plugin(PoissonTrackerNoise art::module
       Offline::SeedService
 )
 
+cet_build_plugin(StationStepSelector art::module
+    REG_SOURCE src/StationStepSelector_module.cc
+    LIBRARIES REG
+      Offline::TrackerMC
+
+      Offline::ProditionsService
+      Offline::SeedService
+)
+
 cet_build_plugin(StrawDigisFromStrawGasSteps art::module
     REG_SOURCE src/StrawDigisFromStrawGasSteps_module.cc
     LIBRARIES REG