diff --git a/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp b/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp
index ecf3ea5169..f9be706686 100644
--- a/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp
+++ b/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp
@@ -39,8 +39,8 @@
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RivTernaryTextureCoordsCreator::RivTernaryTextureCoordsCreator( RimEclipseResultDefinition* cellResultColors,
-                                                                RimTernaryLegendConfig*     ternaryLegendConfig,
+RivTernaryTextureCoordsCreator::RivTernaryTextureCoordsCreator( const RimEclipseResultDefinition* cellResultColors,
+                                                                RimTernaryLegendConfig*           ternaryLegendConfig,
                                                                 RimSimWellInViewCollection* simWellInViewCollection,
                                                                 size_t                      timeStepIndex,
                                                                 size_t                      gridIndex,
@@ -92,9 +92,9 @@ RivTernaryTextureCoordsCreator::RivTernaryTextureCoordsCreator( RimEclipseResult
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RivTernaryTextureCoordsCreator::RivTernaryTextureCoordsCreator( RimEclipseResultDefinition*   cellResultColors,
-                                                                const RivTernaryScalarMapper* ternaryColorMapper,
-                                                                size_t                        timeStepIndex )
+RivTernaryTextureCoordsCreator::RivTernaryTextureCoordsCreator( const RimEclipseResultDefinition* cellResultColors,
+                                                                const RivTernaryScalarMapper*     ternaryColorMapper,
+                                                                size_t                            timeStepIndex )
     : m_quadMapper( nullptr )
 {
     RigEclipseCaseData* eclipseCase = cellResultColors->eclipseCase()->eclipseCaseData();
diff --git a/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.h b/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.h
index a6b443337c..f277cb2753 100644
--- a/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.h
+++ b/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.h
@@ -40,16 +40,16 @@ class StructGridQuadToCellFaceMapper;
 class RivTernaryTextureCoordsCreator
 {
 public:
-    RivTernaryTextureCoordsCreator( RimEclipseResultDefinition*                cellResultColors,
+    RivTernaryTextureCoordsCreator( const RimEclipseResultDefinition*          cellResultColors,
                                     RimTernaryLegendConfig*                    ternaryLegendConfig,
                                     RimSimWellInViewCollection*                simWellInViewCollection,
                                     size_t                                     timeStepIndex,
                                     size_t                                     gridIndex,
                                     const cvf::StructGridQuadToCellFaceMapper* quadMapper );
 
-    RivTernaryTextureCoordsCreator( RimEclipseResultDefinition*   cellResultColors,
-                                    const RivTernaryScalarMapper* ternaryColorMapper,
-                                    size_t                        timeStepIndex );
+    RivTernaryTextureCoordsCreator( const RimEclipseResultDefinition* cellResultColors,
+                                    const RivTernaryScalarMapper*     ternaryColorMapper,
+                                    size_t                            timeStepIndex );
 
     void createTextureCoords( cvf::Vec2fArray* quadTextureCoords );
     void createTextureCoords( cvf::Vec2fArray* triTextureCoords, const std::vector<size_t>& triangleToCellIdx );
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
index 0f1a20fad4..94d655a3c1 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
@@ -225,7 +225,7 @@ void RimEclipseResultDefinition::setEclipseCase( RimEclipseCase* eclipseCase )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimEclipseCase* RimEclipseResultDefinition::eclipseCase()
+RimEclipseCase* RimEclipseResultDefinition::eclipseCase() const 
 {
     return m_eclipseCase;
 }
@@ -1230,7 +1230,7 @@ void RimEclipseResultDefinition::setResultVariable( const QString& val )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimFlowDiagSolution* RimEclipseResultDefinition::flowDiagSolution()
+RimFlowDiagSolution* RimEclipseResultDefinition::flowDiagSolution() const
 {
     return m_flowSolution();
 }
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
index c79944a2d0..9abbd2a284 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
+++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
@@ -75,7 +75,7 @@ public:
     void simpleCopy( const RimEclipseResultDefinition* other );
 
     void            setEclipseCase( RimEclipseCase* eclipseCase );
-    RimEclipseCase* eclipseCase();
+    RimEclipseCase* eclipseCase() const;
 
     RiaDefines::ResultCatType resultType() const
     {
@@ -94,7 +94,7 @@ public:
     virtual void setResultVariable( const QString& val );
 
     void                     setFlowSolution( RimFlowDiagSolution* flowSol );
-    RimFlowDiagSolution*     flowDiagSolution();
+    RimFlowDiagSolution*     flowDiagSolution() const;
     RigFlowDiagResultAddress flowDiagResAddress() const;
 
     void setFlowDiagTracerSelectionType( FlowTracerSelectionType selectionType );
diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
index 419676f151..264c2036dc 100644
--- a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
+++ b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
@@ -576,7 +576,7 @@ QString RimGeoMechResultDefinition::diffResultUiShortName() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RigGeoMechCaseData* RimGeoMechResultDefinition::ownerCaseData()
+RigGeoMechCaseData* RimGeoMechResultDefinition::ownerCaseData() const
 {
     return m_geomCase->geoMechData();
 }
diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h
index 3d19626fb4..4c98c9902a 100644
--- a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h
+++ b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h
@@ -47,7 +47,7 @@ public:
 
     void setGeoMechCase( RimGeoMechCase* geomCase );
 
-    RigGeoMechCaseData* ownerCaseData();
+    RigGeoMechCaseData* ownerCaseData() const;
     bool                hasResult();
     void                loadResult();
     void                setAddWellPathDerivedResults( bool addWellPathDerivedResults );
diff --git a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp
index 7e9fbd6bbb..c74aa7b5bd 100644
--- a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp
@@ -40,10 +40,10 @@
 ///
 //--------------------------------------------------------------------------------------------------
 cvf::ref<RigResultAccessor>
-    RigResultAccessorFactory::createFromResultDefinition( const RigEclipseCaseData*   eclipseCase,
-                                                          size_t                      gridIndex,
-                                                          size_t                      timeStepIndex,
-                                                          RimEclipseResultDefinition* resultDefinition )
+    RigResultAccessorFactory::createFromResultDefinition( const RigEclipseCaseData*         eclipseCase,
+                                                          size_t                            gridIndex,
+                                                          size_t                            timeStepIndex,
+                                                          const RimEclipseResultDefinition* resultDefinition )
 {
     if ( resultDefinition->isFlowDiagOrInjectionFlooding() )
     {
diff --git a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h
index f38a7be418..e841340463 100644
--- a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h
+++ b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h
@@ -33,10 +33,10 @@ class RigEclipseResultAddress;
 class RigResultAccessorFactory
 {
 public:
-    static cvf::ref<RigResultAccessor> createFromResultDefinition( const RigEclipseCaseData*   eclipseCase,
-                                                                   size_t                      gridIndex,
-                                                                   size_t                      timeStepIndex,
-                                                                   RimEclipseResultDefinition* resultDefinition );
+    static cvf::ref<RigResultAccessor> createFromResultDefinition( const RigEclipseCaseData*         eclipseCase,
+                                                                   size_t                            gridIndex,
+                                                                   size_t                            timeStepIndex,
+                                                                   const RimEclipseResultDefinition* resultDefinition );
 
     static cvf::ref<RigResultAccessor> createFromResultAddress( const RigEclipseCaseData*      eclipseCase,
                                                                 size_t                         gridIndex,