diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index 44e276ddde54a166d41c92f8be8c23316a3ff1dc..16e9a193d5a75cc8c9a69f33887934f811178c73 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -167,7 +167,7 @@ Foam::kineticTheoryModel::kineticTheoryModel
             IOobject::NO_WRITE
         ),
         Ua_.mesh(),
-        dimensionedScalar("zero", dimensionSet(0, 0, 0, 0, 0), 0.0)
+        dimensionedScalar("zero", dimensionSet(1, -1, -1, 0, 0), 0.0)
     ),
     gs0_
     (
diff --git a/bin/tools/CleanFunctions b/bin/tools/CleanFunctions
index 1577d5583c783434ced371e507e1806e493c17f5..4f0ceb40233dec29329fa6a19ed21aba05950ac1 100644
--- a/bin/tools/CleanFunctions
+++ b/bin/tools/CleanFunctions
@@ -88,7 +88,7 @@ removeCase ()
 
 cleanSamples ()
 {
-    rm -rf {samples,sampleSurfaces} > /dev/null 2>&1
+    rm -rf {sets,samples,sampleSurfaces} > /dev/null 2>&1
 }
 
 cleanUcomponents ()
diff --git a/tutorials/mhdFoam/Allrun b/tutorials/mhdFoam/Allrun
index 6f04c7152af04b01f4792bcf2b914c06e6e39a37..aca66b35332378f5c60c899af6ddd07101b6f780 100755
--- a/tutorials/mhdFoam/Allrun
+++ b/tutorials/mhdFoam/Allrun
@@ -7,4 +7,5 @@ application="mhdFoam"
 
 (cd hartmann && runApplication blockMesh)
 (cd hartmann && runApplication $application)
+(cd hartmann && runApplication foamCalc components U)
 (cd hartmann && runApplication sample)
diff --git a/tutorials/mhdFoam/hartmann/constant/polyMesh/boundary b/tutorials/mhdFoam/hartmann/constant/polyMesh/boundary
index acc4e4c3901830fa60e474db082969f05dad5b2e..0be28ca2082b6a0b68d2ee50bd36df6db0680dac 100644
--- a/tutorials/mhdFoam/hartmann/constant/polyMesh/boundary
+++ b/tutorials/mhdFoam/hartmann/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev-8cbffd16687e                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/mhdFoam/hartmann/system/sampleDict b/tutorials/mhdFoam/hartmann/system/sampleDict
index d7c5a97c45a9ca29dfdaf1702621deb5cf2f7c58..e62120c869735ae45ea76e62cde6f7ae2d551a3b 100644
--- a/tutorials/mhdFoam/hartmann/system/sampleDict
+++ b/tutorials/mhdFoam/hartmann/system/sampleDict
@@ -18,9 +18,9 @@ interpolationScheme cellPoint;
 
 setFormat     raw;
 
-sets      
+sets
 (
-    line_centreProfile 
+    line_centreProfile
     {
         type            uniform;
 
@@ -34,9 +34,9 @@ sets
 surfaces
 ();
 
-fields          
+fields
 (
-    U.component(0)
+    Ux
 );
 
 // ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary b/tutorials/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary
index 8b28212be9ff78cf8b96cbff88c8877307023d04..e2e0e3a9f23e9f26addc8bba6e079d4e67c0de81 100644
--- a/tutorials/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary
+++ b/tutorials/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev-8cbffd16687e                      |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,39 +10,37 @@ FoamFile
     version     2.0;
     format      ascii;
     class       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 4
 (
-inlet
-{
-    type patch;
-    nFaces 30;
-    startFace 11770;
-}
-
-outlet
-{
-    type patch;
-    nFaces 30;
-    startFace 11800;
-}
-
-walls
-{
-    type wall;
-    nFaces 400;
-    startFace 11830;
-}
-
-frontAndBackPlanes
-{
-    type empty;
-    nFaces 12000;
-    startFace 12230;
-}
+    inlet
+    {
+        type            patch;
+        nFaces          30;
+        startFace       11770;
+    }
+    outlet
+    {
+        type            patch;
+        nFaces          30;
+        startFace       11800;
+    }
+    walls
+    {
+        type            wall;
+        nFaces          400;
+        startFace       11830;
+    }
+    frontAndBackPlanes
+    {
+        type            empty;
+        nFaces          12000;
+        startFace       12230;
+    }
 )
 
 // ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed2/system/controlDict b/tutorials/twoPhaseEulerFoam/bed2/system/controlDict
index 8deea7de4ad2e0cf25ab9144ca27308e8796f91e..85c8fc5cb84d409f16b9751dc6c3d99182104c1f 100644
--- a/tutorials/twoPhaseEulerFoam/bed2/system/controlDict
+++ b/tutorials/twoPhaseEulerFoam/bed2/system/controlDict
@@ -60,6 +60,8 @@ functions
         // Where to load it from (if not already in solver)
         functionObjectLibs ("libfieldAverage.so");
 
+        outputControl outputTime;
+
         // Fields to be  averaged - runTime modifiable
         fields
         (