diff --git a/src/libraries/TRIGGER/DL1MCTrigger_factory.cc b/src/libraries/TRIGGER/DL1MCTrigger_factory.cc
index 0cc8c59d95..3e9eef3d8b 100644
--- a/src/libraries/TRIGGER/DL1MCTrigger_factory.cc
+++ b/src/libraries/TRIGGER/DL1MCTrigger_factory.cc
@@ -1380,7 +1380,7 @@ int  DL1MCTrigger_factory::Read_RCDB(const std::shared_ptr<const JEvent>& event,
   
   
   auto json = rtvsCnd->ToJsonDocument();               // The CODA rtvs is serialized as JSon dictionary.  
-  string fileName(json["%(config)"].GetString());      // We need item with name '%(config)'
+  string fileName(json.at("%(config)").get_string());  // We need item with name '%(config)'
   
   auto file = connection.GetFile(runnumber, fileName);
   
diff --git a/src/libraries/TRIGGER/DL1MCTrigger_factory_CPP.cc b/src/libraries/TRIGGER/DL1MCTrigger_factory_CPP.cc
index 6154e077a3..07a2941924 100644
--- a/src/libraries/TRIGGER/DL1MCTrigger_factory_CPP.cc
+++ b/src/libraries/TRIGGER/DL1MCTrigger_factory_CPP.cc
@@ -1143,7 +1143,7 @@ void DL1MCTrigger_factory_CPP::Read_RCDB(const shared_ptr<const JEvent>& event,
   if(!rtvsCnd)  throw JException("Read_RCDB: rtvs is not set");
 
   auto json = rtvsCnd->ToJsonDocument();
-  string fileName = json["%(config)"].GetString();
+  string fileName(json.at("%(config)").get_string());
   auto file = connection.GetFile(runnumber, fileName);
   if(!file) throw JException("Read_RCDB: missed json file");
 
diff --git a/src/libraries/TRIGGER/DL1MCTrigger_factory_DATA.cc b/src/libraries/TRIGGER/DL1MCTrigger_factory_DATA.cc
index 3dc89a77c5..991e292ba4 100644
--- a/src/libraries/TRIGGER/DL1MCTrigger_factory_DATA.cc
+++ b/src/libraries/TRIGGER/DL1MCTrigger_factory_DATA.cc
@@ -1181,7 +1181,7 @@ auto runnumber = event->GetRunNumber();
   
   
   auto json = rtvsCnd->ToJsonDocument();               // The CODA rtvs is serialized as JSon dictionary.  
-  string fileName(json["%(config)"].GetString());      // We need item with name '%(config)'
+  string fileName(json.at("%(config)").get_string());  // We need item with name '%(config)'
   
   auto file = connection.GetFile(runnumber, fileName);
   
diff --git a/src/plugins/Analysis/SConscript b/src/plugins/Analysis/SConscript
index 28fe0658e7..4ad25c9512 100644
--- a/src/plugins/Analysis/SConscript
+++ b/src/plugins/Analysis/SConscript
@@ -6,7 +6,7 @@ Import('*')
 # Default targets (always built)
 subdirs = ['ReactionFilter', 'b1pi_hists', 'ReactionEfficiency']
 subdirs.extend(['DAQTree', 'DAQTreeBCAL'])
-subdirs.extend(['monitoring_hists'])
+subdirs.extend(['monitoring_hists','trackeff_hists'])
 subdirs.extend(['p2pi_hists','p3pi_hists','ppi0gamma_hists'])
 subdirs.extend(['fcal_charged','TPOL_tree','mcthrown_tree'])
 subdirs.extend(['imaging','dirc_hists','TRD_hists','compton'])
@@ -16,7 +16,7 @@ SConscript(dirs=subdirs, exports='env osname', duplicate=0)
 # Optional targets
 optdirs = ['pedestals','bcal_calib','bcal_calib_cosmic_cdc', 'CPPMVAtree']
 
-optdirs.extend(['trackeff_hists', 'mcthrown_hists', 'cdc_hists', 'fcal_hists'])
+optdirs.extend(['mcthrown_hists', 'cdc_hists', 'fcal_hists'])
 optdirs.extend(['p4pi_hists','p2k_hists','p2gamma_hists','p2pi0_hists'])
 optdirs.extend(['B3pi_eff_missgamma','B3pi_eff_misspip','B3pi_eff_misspim','B3pi_eff_missprot'])
 subdirs.extend(['pid_dirc','truth_dirc', 'lut_dirc', 'dirc_reactions', 'dirc_tree'])
diff --git a/src/plugins/monitoring/FCAL2_invmass/fit_pi0.C b/src/plugins/monitoring/FCAL2_invmass/fit_pi0.C
index 83fa76c429..e440eba8ff 100644
--- a/src/plugins/monitoring/FCAL2_invmass/fit_pi0.C
+++ b/src/plugins/monitoring/FCAL2_invmass/fit_pi0.C
@@ -2,13 +2,13 @@
 // hnamepath:  /FCAL2_invmass/h_2gamma_FCAL_FCAL
 // hnamepath:  /FCAL2_invmass/h_2gamma_BCAL_BCAL
 {
-  TDirectory *dir = (TDirectory*)gDirectory->FindObjectAny("bcal_inv_mass");
+  TDirectory *dir = (TDirectory*)gDirectory->FindObjectAny("FCAL2_invmass");
   if(dir) dir->cd();
   else return;
   
   TCanvas *c1=NULL;
   if(gPad == NULL){
-    c1=new TCanvas("c1","Two photon mass distributions",1920,960);
+    c1=new TCanvas("c1","Two photon mass distributions",900,600);
     c1->cd(0);
     c1->Draw();
     c1->Update();
@@ -72,7 +72,7 @@
     pt2->AddText(Form("#sigma/M = %.3f %%",sigma/mean*100));
     pt2->Draw();
   }
-  TH1F *h3=(TH1F*)_file0->FindObjectAny("h_2gamma_BCAL_BCAL");
+  TH1F *h3=(TH1F*)gDirectory->FindObjectAny("h_2gamma_BCAL_BCAL");
   if (h3){
     c1->cd(3);
     f1->SetParameter(1,0.135);