diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
index 192aa0c9f5..bc6ad0d11e 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
@@ -59,8 +59,7 @@ functions
     patchInlet_phi
     {
         type                surfaceFieldValue;
-        functionObjectLibs  ("libfieldFunctionObjects.so");
-        enabled             true;
+        libs                ("libfieldFunctionObjects.so");
         writeControl        timeStep;
         writeInterval       20;
         log                 true;
@@ -74,17 +73,16 @@ functions
     wallPanel_Qin
     {
         type                patchProbes;
-        functionObjectLibs  ("libsampling.so");
-        enabled             true;
-        writeControl        outputTime;
+        libs                ("libsampling.so");
+        writeControl        writeTime;
         writeInterval       20;
         log                 true;
         patchName           region0_to_panelRegion_wallPanel;
         probeLocations
         (
-            ( 0.15 0.0 0.01 ) //HF2
-            ( 0.2 0.2 0.01 )  //HF3
-            ( 0.0 0.4 0.01 )  //HF4
+            (0.15 0.0 0.01)  // HF2
+            (0.2  0.2 0.01)  // HF3
+            (0.0  0.4 0.01)  // HF4
         );
         fields              (Qin);
     }
@@ -92,19 +90,18 @@ functions
     inletQr_Qin
     {
         type                patchProbes;
-        functionObjectLibs ("libsampling.so");
-        enabled            true;
-        writeControl       outputTime;
-        writeInterval      20;
-        log                true;
-        patchName          inlet;
+        libs                ("libsampling.so");
+        writeControl        writeTime;
+        writeInterval       20;
+        log                 true;
+        patchName           inlet;
         probeLocations
         (
-            ( 0.0 0.0 0.0 )     //HF1
-            ( 0.02 0.0 0.02 )   //HF2
-            ( 0.02 0.0 -0.02 )  //HF3
-            ( -0.02 0.0 0.02 )  //HF4
-            ( -0.02 0.0 -0.02 ) //HF5
+            ( 0.0  0.0  0.0 ) // HF1
+            ( 0.02 0.0  0.02) // HF2
+            ( 0.02 0.0 -0.02) // HF3
+            (-0.02 0.0  0.02) // HF4
+            (-0.02 0.0 -0.02) // HF5
         );
         fields    (Qr Qin);
     }
@@ -112,10 +109,9 @@ functions
     thermoCouple
     {
         type            thermoCoupleProbes;
-
-        functionObjectLibs      ("libutilityFunctionObjects.so");
-        writeControl           timeStep;
-        writeInterval          100;
+        libs            ("libutilityFunctionObjects.so");
+        writeControl    timeStep;
+        writeInterval   100;
 
         solver          Euler;
         absTol          1e-4;
@@ -123,13 +119,13 @@ functions
 
         interpolationScheme cell;
 
-        // thermocouple properties
+        // Thermocouple properties
         rho             8908;
         Cp              440;
         d               1e-3;
         epsilon         0.9;
 
-        radName         G;
+        radiationField  G;
 
         probeLocations
         (
@@ -157,17 +153,17 @@ functions
     probes_O2
     {
         type                probes;
-        functionObjectLibs ("libsampling.so");
-        writeControl       outputTime;
-        writeInterval      30;
+        libs                ("libsampling.so");
+        writeControl        writeTime;
+        writeInterval       30;
         probeLocations
         (
-            (-0.1 0.02 0.0)    //lower Gas
-            (-0.1 0.38 0.0)    //Upper Gas
+            (-0.1 0.02 0.0)    // Lower Gas
+            (-0.1 0.38 0.0)    // Upper Gas
         );
         fields  (O2);
-
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0/alpha.water.org b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0/alpha.water.orig
similarity index 100%
rename from tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0/alpha.water.org
rename to tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0/alpha.water.orig
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allclean b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allclean
index 1029c96a71..9cbb0c1a82 100755
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allclean
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allclean
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 cleanCase
 
-rm system/blockMeshDict
-rm 0/alpha.water
+rm -f system/blockMeshDict
+rm -f 0/alpha.water
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/pachuka.m4 b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/pachuka.m4
old mode 100755
new mode 100644
index baa1f4a96a..b817fb48d7
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/pachuka.m4
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/pachuka.m4
@@ -851,36 +851,34 @@ edges
     arc 73 75 (0.0 Rd3 Hl3)
     arc 69 71 (0.0 qRt Hl3)
 
-    arc 68 69 (qRt 0.0 Hl3)
     arc 76 77 (Rt 0.0 Hl3)
-
     arc 78 79 (-Rt 0.0 Hl3)
+
     arc 76 78 (0.0 -Rt Hl3)
-
     arc 77 79 (0.0 Rt Hl3)
+
     arc 84 85 (Rd 0.0 Ht)
-
     arc 86 87 (-Rd 0.0 Ht)
+
     arc 84 86 (0.0 -Rd Ht)
-
     arc 85 87 (0.0 Rd Ht)
+
     arc 92 93 (Rd3 0.0 Ht)
-
     arc 94 95 (-Rd3 0.0 Ht)
+
     arc 94 92 (0.0 -Rd3 Ht)
-
     arc 93 95 (0.0 Rd3 Ht)
+
     arc 88 89 (qRt 0.0 Ht)
-
     arc 90 91 (-qRt 0.0 Ht)
+
     arc 88 90 (0.0 -qRt Ht)
-
     arc 89 91 (0.0 qRt Ht)
+
     arc 96 97 (Rt 0.0 Ht)
-
     arc 98 99 (-Rt 0.0 Ht)
-    arc 98 96 (0.0 -Rt Ht)
 
+    arc 98 96 (0.0 -Rt Ht)
     arc 97 99 (0.0 Rt Ht)
 );
 
diff --git a/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/constant/g b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/constant/g
new file mode 100644
index 0000000000..abc2088071
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 0 -9.81);
+
+
+// ************************************************************************* //