diff --git a/Generators/EvgenJobTransforms/share/skel.ABtoEVGEN.py b/Generators/EvgenJobTransforms/share/skel.ABtoEVGEN.py
index 15c4fa1360b884c447d4860ba31a3c043669ac53..2fff365f9960333120d6a2e54014b8cadc2adf04 100644
--- a/Generators/EvgenJobTransforms/share/skel.ABtoEVGEN.py
+++ b/Generators/EvgenJobTransforms/share/skel.ABtoEVGEN.py
@@ -154,8 +154,9 @@ if hasattr(runArgs, "rivetAnas"):
     from Rivet_i.Rivet_iConf import Rivet_i
     anaSeq += Rivet_i()
     anaSeq.Rivet_i.Analyses = runArgs.rivetAnas
-    anaSeq.Rivet_i.DoRootHistos = True
-
+    anaSeq.Rivet_i.AnalysisPath = os.environ['PWD']
+    if hasattr(runArgs, "outputYODAFile"):
+      anaSeq.Rivet_i.HistoFile = runArgs.outputYODAFile
 
 ##==============================================================
 ## Pre- and main config parsing
diff --git a/Generators/EvgenJobTransforms/share/skel.GENtoEVGEN.py b/Generators/EvgenJobTransforms/share/skel.GENtoEVGEN.py
index bb1fcbca7173f87c5d3f07bd353850d865bfbfad..3c146dd3c64a7a7783c07423b496fe0051bef7fb 100644
--- a/Generators/EvgenJobTransforms/share/skel.GENtoEVGEN.py
+++ b/Generators/EvgenJobTransforms/share/skel.GENtoEVGEN.py
@@ -178,7 +178,7 @@ if hasattr(runArgs, "rivetAnas"):
     from Rivet_i.Rivet_iConf import Rivet_i
     anaSeq += Rivet_i()
     anaSeq.Rivet_i.Analyses = runArgs.rivetAnas
-    anaSeq.Rivet_i.DoRootHistos = True
+    anaSeq.Rivet_i.AnalysisPath = os.environ['PWD']
     if hasattr(runArgs, "outputYODAFile"):
       anaSeq.Rivet_i.HistoFile = runArgs.outputYODAFile
 
diff --git a/Generators/Rivet_i/src/Rivet_i.cxx b/Generators/Rivet_i/src/Rivet_i.cxx
index fe5cbb0345d4ad4ac88a2c4b1db6a25bda0f6dd7..519fd5f352a841a551c6ca1f3d04d34e3b3ca526 100644
--- a/Generators/Rivet_i/src/Rivet_i.cxx
+++ b/Generators/Rivet_i/src/Rivet_i.cxx
@@ -207,9 +207,8 @@ StatusCode Rivet_i::finalize() {
 
   // Setting cross-section in Rivet
   // If no user-specified cross-section available,
-  // set AMI cross-section at plotting time
-  double custom_xs = m_crossSection != 0 ? m_crossSection : 1.0;
-  m_analysisHandler->setCrossSection({custom_xs, m_crossSection_uncert});
+  // take whatever is in the GenEvent
+  if (m_crossSection != 0)   m_analysisHandler->setCrossSection({m_crossSection, m_crossSection_uncert});
 
   // Call Rivet finalize
   m_analysisHandler->finalize();