diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 2f96ae1418..1a7ba97084 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -151,18 +151,18 @@ Foam::KinematicCloud<ParcelType>::~KinematicCloud()
 template<class ParcelType>
 void Foam::KinematicCloud<ParcelType>::checkParcelProperties
 (
-    ParcelType* pPtr,
+    ParcelType& parcel,
     const scalar lagrangianDt,
     const bool fullyDescribed
 )
 {
     if (!fullyDescribed)
     {
-        pPtr->rho() = constProps_.rho0();
+        parcel.rho() = constProps_.rho0();
     }
 
     scalar carrierDt = this->db().time().deltaT().value();
-    pPtr->stepFraction() = (carrierDt - lagrangianDt)/carrierDt;
+    parcel.stepFraction() = (carrierDt - lagrangianDt)/carrierDt;
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 2dcd277a1d..538975a912 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -357,7 +357,7 @@ public:
             //- Check parcel properties
             void checkParcelProperties
             (
-                ParcelType* pPtr,
+                ParcelType& parcel,
                 const scalar lagrangianDt,
                 const bool fullyDescribed
             );
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index 88d5e8a877..bebeab25a0 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -148,34 +148,34 @@ Foam::ReactingCloud<ParcelType>::~ReactingCloud()
 template<class ParcelType>
 void Foam::ReactingCloud<ParcelType>::checkParcelProperties
 (
-    ParcelType* pPtr,
+    ParcelType& parcel,
     const scalar lagrangianDt,
     const bool fullyDescribed
 )
 {
     ThermoCloud<ParcelType>::checkParcelProperties
     (
-        pPtr,
+        parcel,
         lagrangianDt,
         fullyDescribed
     );
 
     if (!fullyDescribed)
     {
-        pPtr->Y() = composition().YMixture0();
+        parcel.Y() = composition().YMixture0();
     }
     else
     {
         checkSuppliedComposition
         (
-            pPtr->Y(),
+            parcel.Y(),
             composition().YMixture0(),
             "YMixture"
         );
     }
 
     // derived information - store initial mass
-    pPtr->mass0() = pPtr->mass();
+    parcel.mass0() = parcel.mass();
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index beeee65e6e..da346d64ff 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -224,7 +224,7 @@ public:
             //- Check parcel properties
             void checkParcelProperties
             (
-                ParcelType* pPtr,
+                ParcelType& parcel,
                 const scalar lagrangianDt,
                 const bool fullyDescribed
             );
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index 379f12f341..36521105b5 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -76,14 +76,14 @@ Foam::ReactingMultiphaseCloud<ParcelType>::~ReactingMultiphaseCloud()
 template<class ParcelType>
 void Foam::ReactingMultiphaseCloud<ParcelType>::checkParcelProperties
 (
-    ParcelType* pPtr,
+    ParcelType& parcel,
     const scalar lagrangianDt,
     const bool fullyDescribed
 )
 {
     ReactingCloud<ParcelType>::checkParcelProperties
     (
-        pPtr,
+        parcel,
         lagrangianDt,
         fullyDescribed
     );
@@ -94,27 +94,27 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::checkParcelProperties
 
     if (!fullyDescribed)
     {
-        pPtr->YGas() = this->composition().Y0(idGas);
-        pPtr->YLiquid() = this->composition().Y0(idLiquid);
-        pPtr->YSolid() = this->composition().Y0(idSolid);
+        parcel.YGas() = this->composition().Y0(idGas);
+        parcel.YLiquid() = this->composition().Y0(idLiquid);
+        parcel.YSolid() = this->composition().Y0(idSolid);
     }
     else
     {
         this->checkSuppliedComposition
         (
-            pPtr->YGas(),
+            parcel.YGas(),
             this->composition().Y0(idGas),
             "YGas"
         );
         this->checkSuppliedComposition
         (
-            pPtr->YLiquid(),
+            parcel.YLiquid(),
             this->composition().Y0(idLiquid),
             "YLiquid"
         );
         this->checkSuppliedComposition
         (
-            pPtr->YSolid(),
+            parcel.YSolid(),
             this->composition().Y0(idSolid),
             "YSolid"
         );
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
index 8a90d25ef7..e99375cf23 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -178,7 +178,7 @@ public:
             //- Check parcel properties
             void checkParcelProperties
             (
-                ParcelType* pPtr,
+                ParcelType& parcel,
                 const scalar lagrangianDt,
                 const bool fullyDescribed
             );
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index bdde1bbdfe..19428d38a1 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -113,22 +113,22 @@ Foam::ThermoCloud<ParcelType>::~ThermoCloud()
 template<class ParcelType>
 void Foam::ThermoCloud<ParcelType>::checkParcelProperties
 (
-    ParcelType* pPtr,
+    ParcelType& parcel,
     const scalar lagrangianDt,
     const bool fullyDescribed
 )
 {
     KinematicCloud<ParcelType>::checkParcelProperties
     (
-        pPtr,
+        parcel,
         lagrangianDt,
         fullyDescribed
     );
 
     if (!fullyDescribed)
     {
-        pPtr->T() = constProps_.T0();
-        pPtr->cp() = constProps_.cp0();
+        parcel.T() = constProps_.T0();
+        parcel.cp() = constProps_.cp0();
     }
 }
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index 2660060baf..aaebdff80c 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -220,7 +220,7 @@ public:
             //- Check parcel properties
             void checkParcelProperties
             (
-                ParcelType* pPtr,
+                ParcelType& parcel,
                 const scalar lagrangianDt,
                 const bool fullyDescribed
             );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index abbba2698d..c102d87a3d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -401,7 +401,7 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
                 setProperties(parcelI, newParcels, timeInj, *pPtr);
 
                 // Check new parcel properties
-                td.cloud().checkParcelProperties(pPtr, dt, fullyDescribed());
+                td.cloud().checkParcelProperties(*pPtr, dt, fullyDescribed());
 
                 // Apply correction to velocity for 2-D cases
                 meshTools::constrainDirection