diff --git a/src/functionObjects/field/ddt2/ddt2.C b/src/functionObjects/field/ddt2/ddt2.C
index 93c6b93472..12d6d2b67a 100644
--- a/src/functionObjects/field/ddt2/ddt2.C
+++ b/src/functionObjects/field/ddt2/ddt2.C
@@ -27,7 +27,6 @@ License
 
 #include "volFields.H"
 #include "dictionary.H"
-#include "FieldFunctions.H"
 #include "steadyStateDdtScheme.H"
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysisObjects.C b/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysisObjects.C
index 5784157f9b..cc34b0f119 100644
--- a/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysisObjects.C
+++ b/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysisObjects.C
@@ -32,19 +32,30 @@ License
 
 namespace Foam
 {
+// Psi-based chemistry
+typedef functionObjects::reactionsSensitivityAnalysis<psiChemistryModel>
+    psiReactionsSensitivityAnalysisFunctionObject;
+
+defineTemplateTypeNameAndDebugWithName
+(
+    psiReactionsSensitivityAnalysisFunctionObject,
+    "psiReactionsSensitivityAnalysis",
+    0
+);
+
+// Rho-based chemistry
+typedef functionObjects::reactionsSensitivityAnalysis<rhoChemistryModel>
+    rhoReactionsSensitivityAnalysisFunctionObject;
+
+defineTemplateTypeNameAndDebugWithName
+(
+    rhoReactionsSensitivityAnalysisFunctionObject,
+    "rhoReactionsSensitivityAnalysis",
+    0
+);
+
 namespace functionObjects
 {
-    // Psi-based chemistry
-    typedef reactionsSensitivityAnalysis<psiChemistryModel>
-        psiReactionsSensitivityAnalysisFunctionObject;
-
-    defineTemplateTypeNameAndDebugWithName
-    (
-        psiReactionsSensitivityAnalysisFunctionObject,
-        "psiReactionsSensitivityAnalysis",
-        0
-    );
-
     addToRunTimeSelectionTable
     (
         functionObject,
@@ -52,18 +63,6 @@ namespace functionObjects
         dictionary
     );
 
-
-    // Rho-based chemistry
-    typedef reactionsSensitivityAnalysis<rhoChemistryModel>
-        rhoReactionsSensitivityAnalysisFunctionObject;
-
-    defineTemplateTypeNameAndDebugWithName
-    (
-        rhoReactionsSensitivityAnalysisFunctionObject,
-        "rhoReactionsSensitivityAnalysis",
-        0
-    );
-
     addToRunTimeSelectionTable
     (
         functionObject,
diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.H b/src/functionObjects/solvers/scalarTransport/scalarTransport.H
index 032f795813..e6020af39c 100644
--- a/src/functionObjects/solvers/scalarTransport/scalarTransport.H
+++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.H
@@ -103,9 +103,6 @@ class scalarTransport
         //- Name of field to process
         word fieldName_;
 
-        //- On/off switch
-        bool active_;
-
         //- Name of flux field (optional)
         word phiName_;
 
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C
index 839137a30b..e848a31087 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,16 +53,21 @@ namespace runTimeControls
     defineTypeNameAndDebug(minMaxCondition, 0);
     addToRunTimeSelectionTable(runTimeCondition, minMaxCondition, dictionary);
 
-    template<>
-    const char* NamedEnum<minMaxCondition::modeType, 2>::names[] =
-    {
-        "minimum",
-        "maximum"
-    };
 }
 }
 }
 
+template<>
+const char* Foam::NamedEnum
+<
+    Foam::functionObjects::runTimeControls::minMaxCondition::modeType,
+    2
+>::names[] =
+{
+    "minimum",
+    "maximum"
+};
+
 const Foam::NamedEnum
 <
     Foam
@@ -86,7 +91,7 @@ Foam::functionObjects::runTimeControls::minMaxCondition::minMaxCondition
 )
 :
     runTimeCondition(name, obr, dict, state),
-    functionObjectName_(dict.lookup("functionObjectName")),
+    functionObjectName_(dict.lookup("functionObject")),
     mode_(modeTypeNames_.read(dict.lookup("mode"))),
     fieldNames_(dict.lookup("fields")),
     value_(readScalar(dict.lookup("value")))
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index 87b434646e..90f52a9bbc 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -72,8 +72,6 @@ void Foam::ThermoParcel<ParcelType>::cellValueSourceCorrection
 {
     this->Uc_ += td.cloud().UTrans()[celli]/this->massCell(celli);
 
-    const scalar CpMean = td.CpInterp().psi()[celli];
-
     tetIndices tetIs = this->currentTetIndices();
     Tc_ = td.TInterp().interpolate(this->position(), tetIs);