diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index e428a60a3ef211049292ab0f03eb1c65699d62da..1ec0ad76dd96f55c28abe407626ceda5246466ee 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -118,7 +118,7 @@ void Foam::Time::adjustDeltaT()
         scalar nSteps = timeToNextWrite/deltaT_;
 
         // For tiny deltaT the label can overflow!
-        if (nSteps < labelMax)
+        if (nSteps < scalar(labelMax))
         {
             // nSteps can be < 1 so make sure at least 1
             label nStepsToNextWrite = max(1, round(nSteps));
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
index 2b0ae5939aae287e255b9cfd52167f45ec65b688..7550968be5d4ecb0406b57d0c7b8f32d30da79d6 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
@@ -598,7 +598,7 @@ bool Foam::functionObjects::timeControl::adjustTimeStep()
                 // For tiny deltaT the label can overflow!
                 if
                 (
-                    nSteps < labelMax
+                    nSteps < scalar(labelMax)
                  && (
                         deltaTCoeff_ != GREAT
                      || nSteps < nStepsToStartTimeChange_
@@ -644,7 +644,7 @@ bool Foam::functionObjects::timeControl::adjustTimeStep()
                     requiredDeltaTCoeff = seriesDTCoeff_;
                 }
                 // Avoid divide by zero if we need ratio = 1
-                if (1/Foam::log(requiredDeltaTCoeff)> labelMax)
+                if (1/Foam::log(requiredDeltaTCoeff) > scalar(labelMax))
                 {
                     requiredDeltaTCoeff = deltaTCoeff_;
                 }
diff --git a/src/OpenFOAM/primitives/SymmTensor2D/symmTensor2D/symmTensor2D.C b/src/OpenFOAM/primitives/SymmTensor2D/symmTensor2D/symmTensor2D.C
index 5eec5b82d040eae231f61e22b0bc0c18144e1384..d2c384bcf25098352039992be3ef61c212ab7c0a 100644
--- a/src/OpenFOAM/primitives/SymmTensor2D/symmTensor2D/symmTensor2D.C
+++ b/src/OpenFOAM/primitives/SymmTensor2D/symmTensor2D/symmTensor2D.C
@@ -97,7 +97,7 @@ Foam::vector2D Foam::eigenValues(const symmTensor2D& T)
     //(K:Eqs. 3.2-3.3)
     const scalar skewTrace = T.xx() - T.yy();
     const scalar trace = tr(T);
-    const scalar gap = sign(skewTrace)*hypot(skewTrace, 2.0*T.xy());
+    const scalar gap = sign(skewTrace)*hypot(skewTrace, 2*T.xy());
 
     return vector2D(0.5*(trace + gap), 0.5*(trace - gap));
 }
@@ -163,7 +163,7 @@ Foam::tensor2D Foam::eigenVectors
 
     if (mag(skewTrace) > SMALL)
     {
-        const scalar phi = 0.5*atan(2.0*T.xy()/skewTrace);
+        const scalar phi = 0.5*atan(2*T.xy()/skewTrace);
         const scalar cphi = cos(phi);
         const scalar sphi = sin(phi);
         return tensor2D(cphi, sphi, -sphi, cphi);
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.C
index ee6c7d95e1be79d93843b457d34a8704d9e33a07..5efdd4746c353ce3705bebf12d6a37b8429cc7d9 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.C
@@ -88,7 +88,7 @@ Foam::C6H14::C6H14()
     mu_(-20.715, 1207.5, 1.4993, 0.0, 0.0),
     mug_(1.7514e-07, 0.70737, 157.14, 0.0),
     kappa_(0.22492, -0.0003533, 0.0, 0.0, 0.0, 0.0),
-    kappag_(-650.5, 0.8053, -1412100000, 0.0),
+    kappag_(-650.5, 0.8053, -1412100000.0, 0.0),
     sigma_(507.60, 0.055003, 1.2674, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 86.177, 28) // note: Same as nHeptane
 {}