diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7bb1cc52..5d74df4cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ cet_set_compiler_flags(DIAGS CAUTIOUS
   WERROR
   NO_UNDEFINED
   EXTRA_FLAGS -pedantic -Wno-unused-local-typedefs
-              -Wno-uninitialized
+              -Wno-uninitialized -Wno-error=array-bounds
               $<$<CXX_COMPILER_ID:Clang>:-Wno-return-stack-address>
 )
 ##add_definitions(-DGENIE_PRE_R3)
@@ -57,7 +57,6 @@ message(STATUS "${PROJECT_NAME} repository tag: ${GIT_REPOSITORY_TAG}")
 install_source(LIST RepositoryTag)
 
 # these are minimum required versions, not the actual product versions
-find_package( protobuf REQUIRED )
 find_package( art REQUIRED )
 find_package( art_root_io REQUIRED )
 find_package( artdaq_core REQUIRED )
diff --git a/sbndcode/MCTruthExtractor/CMakeLists.txt b/sbndcode/MCTruthExtractor/CMakeLists.txt
index 0166f6ac6..2cac5c7c2 100644
--- a/sbndcode/MCTruthExtractor/CMakeLists.txt
+++ b/sbndcode/MCTruthExtractor/CMakeLists.txt
@@ -30,6 +30,6 @@ set(     MODULE_LIBRARIES
             CLHEP::CLHEP
           )
 cet_build_plugin( NuAna art::module SOURCE NuAna_module.cc LIBRARIES ${MODULE_LIBRARIES})
-target_include_directories (sbndcode_MCTruthExtractor_NuAna_module PRIVATE $ENV{GENIE_INC}/GENIE )
+target_include_directories (sbndcode_MCTruthExtractor_NuAna_module PRIVATE $ENV{GENIE_INC}/GENIE ${GENIE_INCLUDE_DIRS} )
 install_headers()
 install_fhicl()
diff --git a/sbndcode/MCTruthExtractor/alg/CMakeLists.txt b/sbndcode/MCTruthExtractor/alg/CMakeLists.txt
index 6fd21909c..77332c285 100644
--- a/sbndcode/MCTruthExtractor/alg/CMakeLists.txt
+++ b/sbndcode/MCTruthExtractor/alg/CMakeLists.txt
@@ -19,6 +19,6 @@ art_make_library( SOURCE NuAnaAlg.cxx
             CLHEP::CLHEP
             ROOT::Core
           )
-target_include_directories (sbndcode_MCTruthExtractor_alg PRIVATE $ENV{GENIE_INC}/GENIE )
+target_include_directories (sbndcode_MCTruthExtractor_alg PRIVATE $ENV{GENIE_INC}/GENIE ${GENIE_INCLUDE_DIRS})
 install_headers()
 
diff --git a/sbndcode/OpDetSim/CMakeLists.txt b/sbndcode/OpDetSim/CMakeLists.txt
index 35c22cf77..78740226d 100755
--- a/sbndcode/OpDetSim/CMakeLists.txt
+++ b/sbndcode/OpDetSim/CMakeLists.txt
@@ -9,7 +9,7 @@ cet_build_plugin( sbndPDMapAlg art::tool
                     lardataobj::RawData
                     lardata::DetectorInfoServices_DetectorClocksServiceStandard_service
                     larpandora::LArPandoraInterface
-                    sbncode::OpDet_PDMapAlgSimple_tool
+                    sbncode::OpDet_PDMapAlg
                     sbndcode_Utilities_SignalShapingServiceSBND_service
                     nurandom::RandomUtils_NuRandomService_service
                     art::Framework_Services_Optional_RandomNumberGenerator_service