diff --git a/Source/Diagnostics/ComputeDiagFunctors/EdotBFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/EdotBFunctor.cpp
index dea8db37e91..32fe74daed6 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/EdotBFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/EdotBFunctor.cpp
@@ -1,5 +1,12 @@
 #include "EdotBFunctor.H"
 #include "Utils/CoarsenIO.H"
+#include "WarpX.H"
+#include <AMReX_IntVect.H>
+#include <AMReX.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_GpuLaunch.H>
+#include <AMReX_GpuQualifiers.H>
 
 #include <AMReX.H>
 
@@ -15,25 +22,26 @@ EdotBFunctor::EdotBFunctor (amrex::MultiFab const * Ex_src, amrex::MultiFab cons
 void
 EdotBFunctor::operator ()(amrex::MultiFab& mf_dst, int dcomp, const int /*i_buffer=0*/) const
 {
+    using namespace amrex;
     auto & warpx = WarpX::GetInstance();
     const auto dx = warpx.Geom(m_lev).CellSizeArray();
     const auto problo = warpx.Geom(m_lev).ProbLoArray();
     const auto probhi = warpx.Geom(m_lev).ProbHiArray();
-    const IntVect stag_Exsrc = m_Ex_src->ixType().toIntVect();
-    const IntVect stag_Eysrc = m_Ey_src->ixType().toIntVect();
-    const IntVect stag_Ezsrc = m_Ez_src->ixType().toIntVect();
-    const IntVect stag_Bxsrc = m_Bx_src->ixType().toIntVect();
-    const IntVect stag_Bysrc = m_By_src->ixType().toIntVect();
-    const IntVect stag_Bzsrc = m_Bz_src->ixType().toIntVect();
-    const IntVect stag_dst = mf_dst.ixType().toIntVect();
-    GpuArray<int,3> sf_Ex; // staggering of source xfield
-    GpuArray<int,3> sf_Ey; // staggering of source yfield
-    GpuArray<int,3> sf_Ez; // staggering of source zfield
-    GpuArray<int,3> sf_Bx; // staggering of source xfield
-    GpuArray<int,3> sf_By; // staggering of source yfield
-    GpuArray<int,3> sf_Bz; // staggering of source zfield
-    GpuArray<int,3> s_dst;
-    GpuArray<int,3> cr;
+    const amrex::IntVect stag_Exsrc = m_Ex_src->ixType().toIntVect();
+    const amrex::IntVect stag_Eysrc = m_Ey_src->ixType().toIntVect();
+    const amrex::IntVect stag_Ezsrc = m_Ez_src->ixType().toIntVect();
+    const amrex::IntVect stag_Bxsrc = m_Bx_src->ixType().toIntVect();
+    const amrex::IntVect stag_Bysrc = m_By_src->ixType().toIntVect();
+    const amrex::IntVect stag_Bzsrc = m_Bz_src->ixType().toIntVect();
+    const amrex::IntVect stag_dst = mf_dst.ixType().toIntVect();
+    amrex::GpuArray<int,3> sf_Ex; // staggering of source xfield
+    amrex::GpuArray<int,3> sf_Ey; // staggering of source yfield
+    amrex::GpuArray<int,3> sf_Ez; // staggering of source zfield
+    amrex::GpuArray<int,3> sf_Bx; // staggering of source xfield
+    amrex::GpuArray<int,3> sf_By; // staggering of source yfield
+    amrex::GpuArray<int,3> sf_Bz; // staggering of source zfield
+    amrex::GpuArray<int,3> s_dst;
+    amrex::GpuArray<int,3> cr;
 
     for (int i=0; i<AMREX_SPACEDIM; ++i) {
         sf_Ex[i] = stag_Exsrc[i];
diff --git a/Source/Diagnostics/ComputeDiagFunctors/PoyntingVectorFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/PoyntingVectorFunctor.cpp
index ea202ddf8c5..d018cd9c748 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/PoyntingVectorFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/PoyntingVectorFunctor.cpp
@@ -1,7 +1,13 @@
 #include "PoyntingVectorFunctor.H"
 #include "Utils/CoarsenIO.H"
 #include "Utils/WarpXConst.H"
-
+#include "WarpX.H"
+#include <AMReX_IntVect.H>
+#include <AMReX.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_GpuLaunch.H>
+#include <AMReX_GpuQualifiers.H>
 #include <AMReX.H>
 
 PoyntingVectorFunctor::PoyntingVectorFunctor (
@@ -19,25 +25,26 @@ void
 PoyntingVectorFunctor::operator ()(amrex::MultiFab& mf_dst,
                                    int dcomp, const int /*i_buffer=0*/) const
 {
+    using namespace amrex;
     auto & warpx = WarpX::GetInstance();
     const auto dx = warpx.Geom(m_lev).CellSizeArray();
     const auto problo = warpx.Geom(m_lev).ProbLoArray();
     const auto probhi = warpx.Geom(m_lev).ProbHiArray();
-    const IntVect stag_Exsrc = m_Ex_src->ixType().toIntVect();
-    const IntVect stag_Eysrc = m_Ey_src->ixType().toIntVect();
-    const IntVect stag_Ezsrc = m_Ez_src->ixType().toIntVect();
-    const IntVect stag_Bxsrc = m_Bx_src->ixType().toIntVect();
-    const IntVect stag_Bysrc = m_By_src->ixType().toIntVect();
-    const IntVect stag_Bzsrc = m_Bz_src->ixType().toIntVect();
-    const IntVect stag_dst = mf_dst.ixType().toIntVect();
-    GpuArray<int,3> sf_Ex; // staggering of source xfield
-    GpuArray<int,3> sf_Ey; // staggering of source yfield
-    GpuArray<int,3> sf_Ez; // staggering of source zfield
-    GpuArray<int,3> sf_Bx; // staggering of source xfield
-    GpuArray<int,3> sf_By; // staggering of source yfield
-    GpuArray<int,3> sf_Bz; // staggering of source zfield
-    GpuArray<int,3> s_dst;
-    GpuArray<int,3> cr;
+    const amrex::IntVect stag_Exsrc = m_Ex_src->ixType().toIntVect();
+    const amrex::IntVect stag_Eysrc = m_Ey_src->ixType().toIntVect();
+    const amrex::IntVect stag_Ezsrc = m_Ez_src->ixType().toIntVect();
+    const amrex::IntVect stag_Bxsrc = m_Bx_src->ixType().toIntVect();
+    const amrex::IntVect stag_Bysrc = m_By_src->ixType().toIntVect();
+    const amrex::IntVect stag_Bzsrc = m_Bz_src->ixType().toIntVect();
+    const amrex::IntVect stag_dst = mf_dst.ixType().toIntVect();
+    amrex::GpuArray<int,3> sf_Ex; // staggering of source xfield
+    amrex::GpuArray<int,3> sf_Ey; // staggering of source yfield
+    amrex::GpuArray<int,3> sf_Ez; // staggering of source zfield
+    amrex::GpuArray<int,3> sf_Bx; // staggering of source xfield
+    amrex::GpuArray<int,3> sf_By; // staggering of source yfield
+    amrex::GpuArray<int,3> sf_Bz; // staggering of source zfield
+    amrex::GpuArray<int,3> s_dst;
+    amrex::GpuArray<int,3> cr;
 
     for (int i=0; i<AMREX_SPACEDIM; ++i) {
         sf_Ex[i] = stag_Exsrc[i];
diff --git a/Source/Diagnostics/ComputeDiagFunctors/SphericalComponentFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/SphericalComponentFunctor.cpp
index ff00c2661b4..7b8ba368b7d 100644
--- a/Source/Diagnostics/ComputeDiagFunctors/SphericalComponentFunctor.cpp
+++ b/Source/Diagnostics/ComputeDiagFunctors/SphericalComponentFunctor.cpp
@@ -3,8 +3,13 @@
 #ifdef PULSAR
     #include "Particles/PulsarParameters.H"
 #endif
-
+#include "WarpX.H"
+#include <AMReX_IntVect.H>
 #include <AMReX.H>
+#include <AMReX_GpuControl.H>
+#include <AMReX_GpuDevice.H>
+#include <AMReX_GpuLaunch.H>
+#include <AMReX_GpuQualifiers.H>
 
 SphericalComponentFunctor::SphericalComponentFunctor (amrex::MultiFab const * mfx_src,
                                                       amrex::MultiFab const * mfy_src, 
@@ -21,19 +26,20 @@ SphericalComponentFunctor::SphericalComponentFunctor (amrex::MultiFab const * mf
 void 
 SphericalComponentFunctor::operator ()(amrex::MultiFab& mf_dst, int dcomp, const int /*i_buffer=0*/) const
 {
+    using namespace amrex;
     auto & warpx = WarpX::GetInstance();
     const auto dx = warpx.Geom(m_lev).CellSizeArray();
     const auto problo = warpx.Geom(m_lev).ProbLoArray();
     const auto probhi = warpx.Geom(m_lev).ProbHiArray();
-    const IntVect stag_xsrc = m_mfx_src->ixType().toIntVect();
-    const IntVect stag_ysrc = m_mfy_src->ixType().toIntVect();
-    const IntVect stag_zsrc = m_mfz_src->ixType().toIntVect();
-    const IntVect stag_dst = mf_dst.ixType().toIntVect();
-    GpuArray<int,3> sfx; // staggering of source xfield
-    GpuArray<int,3> sfy; // staggering of source yfield
-    GpuArray<int,3> sfz; // staggering of source zfield
-    GpuArray<int,3> s_dst;
-    GpuArray<int,3> cr;
+    const amrex::IntVect stag_xsrc = m_mfx_src->ixType().toIntVect();
+    const amrex::IntVect stag_ysrc = m_mfy_src->ixType().toIntVect();
+    const amrex::IntVect stag_zsrc = m_mfz_src->ixType().toIntVect();
+    const amrex::IntVect stag_dst = mf_dst.ixType().toIntVect();
+    amrex::GpuArray<int,3> sfx; // staggering of source xfield
+    amrex::GpuArray<int,3> sfy; // staggering of source yfield
+    amrex::GpuArray<int,3> sfz; // staggering of source zfield
+    amrex::GpuArray<int,3> s_dst;
+    amrex::GpuArray<int,3> cr;
     
     for (int i=0; i<AMREX_SPACEDIM; ++i) {
         sfx[i] = stag_xsrc[i];
diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp
index c4f55ee7a12..a05b7c5b2bd 100644
--- a/Source/Particles/PhysicalParticleContainer.cpp
+++ b/Source/Particles/PhysicalParticleContainer.cpp
@@ -1270,6 +1270,9 @@ PhysicalParticleContainer::AddPlasmaFlux (int lev, amrex::Real dt)
     bool radially_weighted = plasma_injector->radially_weighted;
 #endif
 
+    int Nmax_particles = 0;
+    int valid_particles_beforeAdd = TotalNumberOfParticles();    
+
     MFItInfo info;
     if (do_tiling && Gpu::notInLaunchRegion()) {
         info.EnableTiling(tile_size);
@@ -1389,6 +1392,7 @@ PhysicalParticleContainer::AddPlasmaFlux (int lev, amrex::Real dt)
         // Max number of new particles. All of them are created,
         // and invalid ones are then discarded
         int max_new_particles = Scan::ExclusiveSum(counts.size(), counts.data(), offset.data());
+        Nmax_particles += max_new_particles;
 
         // Update NextID to include particles created in this function
         Long pid;