diff --git a/ApplicationCode/ProjectDataModel/Summary/RimEnsambleCurveSet.cpp b/ApplicationCode/ProjectDataModel/Summary/RimEnsambleCurveSet.cpp
index 9928e071ab..41cea53298 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimEnsambleCurveSet.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimEnsambleCurveSet.cpp
@@ -61,12 +61,15 @@ static QTextStream& operator >> (QTextStream& str, RifEclipseSummaryAddress& sob
     return str;
 }
 
-template<>
-void caf::AppEnum< RimEnsambleCurveSet::ColorMode >::setUp()
+namespace caf
 {
-    addItem(RimEnsambleCurveSet::SINGLE_COLOR, "SINGLE_COLOR", "Single Color");
-    addItem(RimEnsambleCurveSet::BY_ENSAMBLE_PARAM, "BY_ENSAMBLE_PARAM", "By Ensamble Parameter");
-    setDefault(RimEnsambleCurveSet::SINGLE_COLOR);
+    template<>
+    void AppEnum< RimEnsambleCurveSet::ColorMode >::setUp()
+    {
+        addItem(RimEnsambleCurveSet::SINGLE_COLOR, "SINGLE_COLOR", "Single Color");
+        addItem(RimEnsambleCurveSet::BY_ENSAMBLE_PARAM, "BY_ENSAMBLE_PARAM", "By Ensamble Parameter");
+        setDefault(RimEnsambleCurveSet::SINGLE_COLOR);
+    }
 }
 
 
diff --git a/ApplicationCode/ReservoirDataModel/RigCaseRealizationParameters.cpp b/ApplicationCode/ReservoirDataModel/RigCaseRealizationParameters.cpp
index 0869cc8dd2..558a1e50ba 100644
--- a/ApplicationCode/ReservoirDataModel/RigCaseRealizationParameters.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigCaseRealizationParameters.cpp
@@ -17,7 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RigCaseRealizationParameters.h"
-
+#include <cmath>
 
 //--------------------------------------------------------------------------------------------------
 /// 
diff --git a/ApplicationCode/ReservoirDataModel/RigCaseRealizationParameters.h b/ApplicationCode/ReservoirDataModel/RigCaseRealizationParameters.h
index 6e5075fdb0..801458e04b 100644
--- a/ApplicationCode/ReservoirDataModel/RigCaseRealizationParameters.h
+++ b/ApplicationCode/ReservoirDataModel/RigCaseRealizationParameters.h
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include "cvfBase.h"
 #include "cvfObject.h"
 
 #include <QString>
diff --git a/ApplicationCode/UnitTests/RifCaseRealizationParametersReader-Test.cpp b/ApplicationCode/UnitTests/RifCaseRealizationParametersReader-Test.cpp
index a91bf0e3d8..4d447ff60c 100644
--- a/ApplicationCode/UnitTests/RifCaseRealizationParametersReader-Test.cpp
+++ b/ApplicationCode/UnitTests/RifCaseRealizationParametersReader-Test.cpp
@@ -45,9 +45,9 @@ TEST(RifCaseRealizationParametersReaderTest, SuccessfulParsing)
         const cvf::ref<RigCaseRealizationParameters> parameters = reader.parameters();
         std::map<QString, double> params = parameters->parameters();
 
-        EXPECT_EQ(1, params.count("LETSWOF:L_1OW"));
-        EXPECT_EQ(1, params.count("LETSGOF:KRG1"));
-        EXPECT_EQ(1, params.count("LOG10_MULTFLT:MULTFLT_F1"));
+        EXPECT_EQ(1U, params.count("LETSWOF:L_1OW"));
+        EXPECT_EQ(1U, params.count("LETSGOF:KRG1"));
+        EXPECT_EQ(1U, params.count("LOG10_MULTFLT:MULTFLT_F1"));
 
         EXPECT_EQ(1.83555,   params["LETSWOF:L_1OW"]);
         EXPECT_EQ(0.97,      params["LETSGOF:KRG1"]);