diff --git a/offline/framework/fun4all/Fun4AllServer.cc b/offline/framework/fun4all/Fun4AllServer.cc
index 9dc68afbb0..41e4dd6924 100644
--- a/offline/framework/fun4all/Fun4AllServer.cc
+++ b/offline/framework/fun4all/Fun4AllServer.cc
@@ -1105,7 +1105,14 @@ int Fun4AllServer::EndRun(const int runno)
 int Fun4AllServer::End()
 {
   recoConsts *rc = recoConsts::instance();
-  EndRun(rc->get_IntFlag("RUNNUMBER"));  // call SubsysReco EndRun methods for current run
+  if (rc->FlagExist("RUNNUMBER"))
+  {
+    EndRun(rc->get_IntFlag("RUNNUMBER"));  // call SubsysReco EndRun methods for current run
+  }
+  else
+  {
+    std::cout << PHWHERE << " No RUNNUMBER Int Flag set, not calling EndRun() for registered modules" << std::endl;
+  }
   int i = 0;
   std::vector<std::pair<SubsysReco *, PHCompositeNode *>>::iterator iter;
   gROOT->cd(default_Tdirectory.c_str());
diff --git a/offline/framework/fun4all/Makefile.am b/offline/framework/fun4all/Makefile.am
index 8f9d9e2019..30ca180fcb 100644
--- a/offline/framework/fun4all/Makefile.am
+++ b/offline/framework/fun4all/Makefile.am
@@ -66,7 +66,6 @@ libfun4all_la_SOURCES = \
 libfun4all_la_LIBADD = \
   libSubsysReco.la \
   libTDirectoryHelper.la \
-  -lboost_filesystem \
   -lFROG \
   -lffaobjects \
   -lphool \
diff --git a/offline/framework/fun4allraw/SingleTriggeredInput.cc b/offline/framework/fun4allraw/SingleTriggeredInput.cc
index f2d3b34ef1..434aaac876 100644
--- a/offline/framework/fun4allraw/SingleTriggeredInput.cc
+++ b/offline/framework/fun4allraw/SingleTriggeredInput.cc
@@ -729,6 +729,15 @@ void SingleTriggeredInput::FillPool()
   if (!FilesDone())
   {
     int eventvectorsize = FillEventVector();
+    // this seems a unique signature for raw data files which only contain the
+    // begin and end run event but no data events. FillEventVector() returns -1
+    // and since no events were read the m_PacketEventDeque is empty
+    if (eventvectorsize < 0 && m_PacketEventDeque.empty())
+    {
+      std::cout << Name() << ": No data Events in input file " << FileName() << std::endl;
+      AllDone(1);
+      return;
+    }
     if (eventvectorsize != 0)
     {
       if (Gl1Input()->m_bclkdiffarray_map.empty())
@@ -1226,7 +1235,6 @@ int SingleTriggeredInput::ReadEvent()
     size_t size = m_PacketEventDeque.begin()->second.size();
     std::cout << "deque size: " << size << std::endl;
   }
-
   auto* ref_evt = m_PacketEventDeque.begin()->second.front();
   RunNumber(ref_evt->getRunNumber());
 
diff --git a/simulation/g4simulation/g4main/Makefile.am b/simulation/g4simulation/g4main/Makefile.am
index bff8a37125..c7412330f8 100644
--- a/simulation/g4simulation/g4main/Makefile.am
+++ b/simulation/g4simulation/g4main/Makefile.am
@@ -36,7 +36,6 @@ libg4testbench_la_LDFLAGS = \
 
 libg4testbench_la_LIBADD = \
   libphg4hit.la \
-  -lboost_filesystem \
   -lffamodules \
   -lfun4all \
   -lg4decayer \