diff --git a/ApplicationCode/ModelVisualization/WindowEdgeAxesOverlayItem/RivWindowEdgeAxesOverlayItem.h b/ApplicationCode/ModelVisualization/WindowEdgeAxesOverlayItem/RivWindowEdgeAxesOverlayItem.h
index 924fdda761..08d35a2a77 100644
--- a/ApplicationCode/ModelVisualization/WindowEdgeAxesOverlayItem/RivWindowEdgeAxesOverlayItem.h
+++ b/ApplicationCode/ModelVisualization/WindowEdgeAxesOverlayItem/RivWindowEdgeAxesOverlayItem.h
@@ -37,6 +37,7 @@
 
 #pragma once
 
+#include "cvfBase.h"
 #include "cvfOverlayItem.h"
 #include "cvfArray.h"
 #include "cvfCamera.h"
diff --git a/ApplicationCode/ProjectDataModel/RimTensorResults.cpp b/ApplicationCode/ProjectDataModel/RimTensorResults.cpp
index cc8baaeaea..fbe561aceb 100644
--- a/ApplicationCode/ProjectDataModel/RimTensorResults.cpp
+++ b/ApplicationCode/ProjectDataModel/RimTensorResults.cpp
@@ -244,7 +244,7 @@ QList<caf::PdmOptionItemInfo> RimTensorResults::calculateValueOptions(const caf:
     {
         std::vector<std::string> fieldCompNames = getResultMetaDataForUIFieldSetting();
 
-        for (int oIdx = 0; oIdx < fieldCompNames.size(); ++oIdx)
+        for (size_t oIdx = 0; oIdx < fieldCompNames.size(); ++oIdx)
         {
             options.push_back(caf::PdmOptionItemInfo(QString::fromStdString(fieldCompNames[oIdx]), QString::fromStdString(fieldCompNames[oIdx])));
         }