diff --git a/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx b/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx
index 629804bbbbe..da76264b369 100644
--- a/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx
+++ b/PWGCF/GenericFramework/Tasks/flowGenericFramework.cxx
@@ -71,6 +71,7 @@
 #include <cstdlib>
 #include <iomanip>
 #include <ios>
+#include <iterator>
 #include <map>
 #include <memory>
 #include <sstream>
@@ -939,7 +940,7 @@ struct FlowGenericFramework {
     if (corrconfigsV0.empty()) {
       LOGF(error, "Radial (V0) configuration contains vectors of different size - check the GFWCorrConfig configurable");
     }
-    const size_t requiredChargedConfigs = static_cast<size_t>(SpeciesCount);
+    const auto requiredChargedConfigs = static_cast<size_t>(SpeciesCount);
     const size_t requiredResonanceConfigs = requiredChargedConfigs + static_cast<size_t>(ResonanceCount);
     if (cfgFill.cfgAnalyseChargedHadrons && (corrconfigsV02.size() < requiredChargedConfigs || corrconfigsV0.size() < requiredChargedConfigs)) {
       LOGF(fatal, "Charged-hadron analysis requires at least %zu V02 and V0 correlation configurations", requiredChargedConfigs);
@@ -2362,6 +2363,10 @@ struct FlowGenericFramework {
       if (!track.isPhysicalPrimary()) {
         return;
       }
+      auto pdgParticle = pdgDB->GetParticle(track.pdgCode());
+      if (!pdgParticle || pdgParticle->Charge() == 0.) {
+        return;
+      }
       if (cfgFill.cfgFillQA) {
         fillTrackQA<Gen, Before>(track, vtxz);
       }
diff --git a/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelationsMpi.cxx b/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelationsMpi.cxx
index 39988d92474..0d681481ffb 100644
--- a/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelationsMpi.cxx
+++ b/PWGCF/TwoParticleCorrelations/Tasks/twoParticleCorrelationsMpi.cxx
@@ -367,7 +367,7 @@ struct TwoParticleCorrelationsMpi {
     if (cfgFillAcceptanceWeights && !cfgAcceptance.value.empty()) {
       LOGF(fatal, "cfgFillAcceptanceWeights and cfgAcceptance are mutually exclusive: produce and apply acceptance weights in separate jobs");
     }
-    if (cfgFillAcceptanceWeights && !(doprocessSameDerived || doprocessSameDerivedMultSet || doprocessMCSameDerived)) {
+    if (cfgFillAcceptanceWeights && !(doprocessSameDerived || doprocessSameDerivedCorrected || doprocessSameDerivedMultSet || doprocessSameDerivedMultSetCorrected || doprocessMCSameDerived)) {
       LOGF(fatal, "cfgFillAcceptanceWeights requires a reconstructed derived same-event process");
     }
     if (cfgAcceptancePhiBins < 1 || cfgAcceptanceEtaBins < 1) {
@@ -655,7 +655,7 @@ struct TwoParticleCorrelationsMpi {
       ++nPtPtSubevents;
     }
 
-    if (!cfgFillAcceptanceWeights && (doprocessMCSameDerived || doprocessSameDerived || doprocessSameDerivedMultSet)) {
+    if (!cfgFillAcceptanceWeights && (doprocessMCSameDerived || doprocessSameDerived || doprocessSameDerivedCorrected || doprocessSameDerivedMultSet || doprocessSameDerivedMultSetCorrected)) {
       auto recoProfiles = std::make_unique<TObjArray>();
       addConfigObjectsToObjArray(recoProfiles.get(), mCorrConfigs, cfgUserAxis == EventSeedAxis && eventClassifierPercentileAxisEnabled);
       fFC.setObject(new FlowContainer("FlowContainer"));