diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index c143dba2d1f5fd3ab1cb43abf908bb83d4836f26..3af90199a660f1cc74ab2b81200cd092663e1dd0 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -506,7 +506,8 @@ Foam::tmp<Foam::fvVectorMatrix> Foam::kineticTheoryModel::divDevRhoReff
       - fvc::div
         (
             (this->rho_*this->nut_)*dev2(T(fvc::grad(U)))
-          + ((this->rho_*lambda_)*fvc::div(this->phi_))*symmTensor::I
+          + ((this->rho_*lambda_)*fvc::div(this->phi_))
+           *dimensioned<symmTensor>("I", dimless, symmTensor::I)
         )
     );
 }
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
index ef63a5dd4cab38262b0f54c7f73a8a7184197784..549178c4c6d23cc27d375e5f3ec2f1c7084672ee 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
@@ -27,18 +27,17 @@ gradSchemes
 
 divSchemes
 {
-    default                 none;
+    default                     none;
 
-    div(phi,alpha.air)      Gauss vanLeer;
-    div(phir,alpha.air)     Gauss vanLeer;
+    div(phi,alpha.air)          Gauss vanLeer;
+    div(phir,alpha.air)         Gauss vanLeer;
 
-    "div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1;
-    "div\(phi.*,U.*\)"      Gauss limitedLinearV 1;
-    "div\(\(alpha.*Rc\)\)"  Gauss linear;
-    "div\(phi.*,.*rho.*\)"  Gauss linear;
+    "div\(alphaPhi.*,U.*\)"     Gauss limitedLinearV 1;
+    "div\(phi.*,U.*\)"          Gauss limitedLinearV 1;
+    "div\(phi.*,.*rho.*\)"      Gauss linear;
 
-    "div\(alphaPhi.*,h.*\)" Gauss limitedLinear 1;
-    "div\(alphaPhi.*,K.*\)" Gauss limitedLinear 1;
+    "div\(alphaPhi.*,(h|e).*\)" Gauss limitedLinear 1;
+    "div\(alphaPhi.*,(K.*|p)\)" Gauss limitedLinear 1;
 
     "div\(\(\(alpha.*nuEff.*\)*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
index 93e6cddd228f756399f32ab3ef4d57a9ab9611a7..9fc65bf8cbc74f0036a8175ef25d5f528fb57565 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
@@ -27,25 +27,19 @@ gradSchemes
 
 divSchemes
 {
-    default                 none;
+    default                     none;
 
-    "div\(phi,alpha.*\)"    Gauss vanLeer;
-    "div\(phir,alpha.*\)"   Gauss vanLeer;
+    "div\(phi,alpha.*\)"        Gauss vanLeer;
+    "div\(phir,alpha.*\)"       Gauss vanLeer;
 
     "div\(alphaPhi.*,U.*\)"     Gauss limitedLinearV 1;
     "div\(phi.*,U.*\)"          Gauss limitedLinearV 1;
-    "div\(\(alpha.*Rc\)\)"      Gauss linear;
     "div\(phi.*,.*rho.*\)"      Gauss linear;
-    div(alphaPhi.particles,Theta.particles) Gauss limitedLinear 1;
-    div(alphaPhi.air,k.air)     Gauss limitedLinear 1;
-    div(alphaPhi.air,epsilon.air)     Gauss limitedLinear 1;
 
     "div\(alphaPhi.*,(h|e).*\)" Gauss limitedLinear 1;
     "div\(alphaPhi.*,(K.*|p)\)" Gauss limitedLinear 1;
 
     "div\(\(\(alpha.*nuEff.*\)*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
-
-    div(((nut.particles*dev2(T(grad(U.particles))))+((lambda.particles*div(phi.particles))*(1,0,0,1,0,1))))  Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
index faed9fcacb65e8c45c9e0fd693ffcbd571b48868..c29b10072aedbfddf0ac04218b035914f8091684 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -27,18 +27,17 @@ gradSchemes
 
 divSchemes
 {
-    default             none;
+    default                     none;
 
-    div(phi,alpha.air)      Gauss vanLeer;
-    div(phir,alpha.air)     Gauss vanLeer;
+    div(phi,alpha.air)          Gauss vanLeer;
+    div(phir,alpha.air)         Gauss vanLeer;
 
-    "div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1;
-    "div\(phi.*,U.*\)"      Gauss limitedLinearV 1;
-    "div\(\(alpha.*Rc\)\)"  Gauss linear;
-    "div\(phi.*,.*rho.*\)"  Gauss linear;
+    "div\(alphaPhi.*,U.*\)"     Gauss limitedLinearV 1;
+    "div\(phi.*,U.*\)"          Gauss limitedLinearV 1;
+    "div\(phi.*,.*rho.*\)"      Gauss linear;
 
-    "div\(alphaPhi.*,h.*\)" Gauss limitedLinear 1;
-    "div\(alphaPhi.*,K.*\)" Gauss limitedLinear 1;
+    "div\(alphaPhi.*,(h|e).*\)" Gauss limitedLinear 1;
+    "div\(alphaPhi.*,(K.*|p)\)" Gauss limitedLinear 1;
 
     "div\(\(\(alpha.*nuEff.*\)*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
@@ -62,7 +61,6 @@ fluxRequired
 {
     default         no;
     p               ;
-    alpha1;
 }
 
 
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/ras/bubbleColumn/system/fvSchemes b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/ras/bubbleColumn/system/fvSchemes
index 9393e5c97eebcfa75718194cba3bc6ff794421ee..f55c52ee564855bde82231ad16e98d275780af37 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/ras/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/ras/bubbleColumn/system/fvSchemes
@@ -27,18 +27,17 @@ gradSchemes
 
 divSchemes
 {
-    default                 none;
+    default                     none;
 
-    div(phi,alpha.air)      Gauss vanLeer;
-    div(phir,alpha.air)     Gauss vanLeer;
+    div(phi,alpha.air)          Gauss vanLeer;
+    div(phir,alpha.air)         Gauss vanLeer;
 
-    "div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1;
-    "div\(phi.*,U.*\)"      Gauss limitedLinearV 1;
-    "div\(\(alpha.*Rc\)\)"  Gauss linear;
-    "div\(phi.*,.*rho.*\)"  Gauss linear;
+    "div\(alphaPhi.*,U.*\)"     Gauss limitedLinearV 1;
+    "div\(phi.*,U.*\)"          Gauss limitedLinearV 1;
+    "div\(phi.*,.*rho.*\)"      Gauss linear;
 
-    "div\(alphaPhi.*,h.*\)" Gauss limitedLinear 1;
-    "div\(alphaPhi.*,K.*\)" Gauss limitedLinear 1;
+    "div\(alphaPhi.*,(h|e).*\)" Gauss limitedLinear 1;
+    "div\(alphaPhi.*,(K.*|p)\)" Gauss limitedLinear 1;
 
     "div\(alphaPhi.*,(k|epsilon).*\)"  Gauss limitedLinear 1;
 
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/ras/fluidisedBed/system/fvSchemes b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/ras/fluidisedBed/system/fvSchemes
index 93e6cddd228f756399f32ab3ef4d57a9ab9611a7..2546db411275847e1db31badc51db945562292ac 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/ras/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/ras/fluidisedBed/system/fvSchemes
@@ -27,25 +27,25 @@ gradSchemes
 
 divSchemes
 {
-    default                 none;
+    default                     none;
 
-    "div\(phi,alpha.*\)"    Gauss vanLeer;
-    "div\(phir,alpha.*\)"   Gauss vanLeer;
+    "div\(phi,alpha.*\)"        Gauss vanLeer;
+    "div\(phir,alpha.*\)"       Gauss vanLeer;
 
     "div\(alphaPhi.*,U.*\)"     Gauss limitedLinearV 1;
     "div\(phi.*,U.*\)"          Gauss limitedLinearV 1;
-    "div\(\(alpha.*Rc\)\)"      Gauss linear;
     "div\(phi.*,.*rho.*\)"      Gauss linear;
-    div(alphaPhi.particles,Theta.particles) Gauss limitedLinear 1;
-    div(alphaPhi.air,k.air)     Gauss limitedLinear 1;
-    div(alphaPhi.air,epsilon.air)     Gauss limitedLinear 1;
 
     "div\(alphaPhi.*,(h|e).*\)" Gauss limitedLinear 1;
     "div\(alphaPhi.*,(K.*|p)\)" Gauss limitedLinear 1;
 
+    div(alphaPhi.particles,Theta.particles) Gauss limitedLinear 1;
+
+    "div\(alphaPhi.*,(k|epsilon).*\)"  Gauss limitedLinear 1;
+
     "div\(\(\(alpha.*nuEff.*\)*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 
-    div(((nut.particles*dev2(T(grad(U.particles))))+((lambda.particles*div(phi.particles))*(1,0,0,1,0,1))))  Gauss linear;
+    div(((nut.particles*dev2(T(grad(U.particles))))+((lambda.particles*div(phi.particles))*I)))  Gauss linear;
 }
 
 laplacianSchemes