diff --git a/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp b/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
index d9386ba067..7aaebe34e2 100644
--- a/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
+++ b/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
@@ -52,7 +52,7 @@ RifEclipseOutputFileTools::~RifEclipseOutputFileTools()
 
 struct KeywordItemCounter
 {
-    KeywordItemCounter(std::string keyword, size_t aggregatedItemCount)
+    KeywordItemCounter(const std::string& keyword, size_t aggregatedItemCount)
         : m_keyword(keyword),
         m_aggregatedItemCount(aggregatedItemCount),
         m_reportStepCount(1)
diff --git a/ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h b/ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h
index 75e1cbffe4..92024f378b 100644
--- a/ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h
+++ b/ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h
@@ -36,7 +36,7 @@
 class RifKeywordLocation
 {
 public:
-    RifKeywordLocation(std::string keyword, size_t itemCount, int indexWithinReportStep)
+    RifKeywordLocation(const std::string& keyword, size_t itemCount, int indexWithinReportStep)
         : m_keyword(keyword),
         m_itemCount(itemCount),
         m_indexWithinReportStep(indexWithinReportStep)
diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp
index 5777a4f43a..e6f77ad984 100644
--- a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp
+++ b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp
@@ -367,7 +367,7 @@ std::map<std::string, std::vector<std::string> > RigFemPartResultsCollection::sc
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RigFemScalarResultFrames* RigFemPartResultsCollection::calculateBarConvertedResult(int partIndex, const RigFemResultAddress &convertedResultAddr, const std::string fieldNameToConvert)
+RigFemScalarResultFrames* RigFemPartResultsCollection::calculateBarConvertedResult(int partIndex, const RigFemResultAddress &convertedResultAddr, const std::string& fieldNameToConvert)
 {
     caf::ProgressInfo frameCountProgress(this->frameCount() * 2, "");
     frameCountProgress.setProgressDescription("Calculating " + QString::fromStdString(convertedResultAddr.fieldName + ": " + convertedResultAddr.componentName));
diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.h b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.h
index 1898abb026..5659479e1b 100644
--- a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.h
+++ b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.h
@@ -86,7 +86,7 @@ private:
                                                                               RigFemScalarResultFrames * dstDataFrames,
                                                                               caf::ProgressInfo* frameCountProgress);
 
-    RigFemScalarResultFrames*                        calculateBarConvertedResult(int partIndex, const RigFemResultAddress &convertedResultAddr, const std::string fieldNameToConvert);
+    RigFemScalarResultFrames*                        calculateBarConvertedResult(int partIndex, const RigFemResultAddress &convertedResultAddr, const std::string& fieldNameToConvert);
     RigFemScalarResultFrames*                        calculateEnIpPorBarResult(int partIndex, const RigFemResultAddress &convertedResultAddr);
     RigFemScalarResultFrames*                        calculateTimeLapseResult(int partIndex, const RigFemResultAddress& resVarAddr);
     RigFemScalarResultFrames*                        calculateMeanStressSEM(int partIndex, const RigFemResultAddress& resVarAddr);
diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/RigGeoMechCaseData.cpp b/ApplicationCode/GeoMech/GeoMechDataModel/RigGeoMechCaseData.cpp
index 67e2f1d59c..6cc6ef6f70 100644
--- a/ApplicationCode/GeoMech/GeoMechDataModel/RigGeoMechCaseData.cpp
+++ b/ApplicationCode/GeoMech/GeoMechDataModel/RigGeoMechCaseData.cpp
@@ -38,8 +38,9 @@
 /// 
 //--------------------------------------------------------------------------------------------------
 RigGeoMechCaseData::RigGeoMechCaseData(const std::string& fileName)
+    : m_geoMechCaseFileName(fileName)
 {
-    m_geoMechCaseFileName = fileName;
+
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/GeoMech/OdbReader/RifOdbReader.cpp b/ApplicationCode/GeoMech/OdbReader/RifOdbReader.cpp
index e7ddabb22a..bfe7c66e9f 100644
--- a/ApplicationCode/GeoMech/OdbReader/RifOdbReader.cpp
+++ b/ApplicationCode/GeoMech/OdbReader/RifOdbReader.cpp
@@ -696,7 +696,7 @@ std::map<std::string, std::vector<std::string> > RifOdbReader::fieldAndComponent
     std::map<std::string, std::vector<std::string> > fieldsAndComponents;
 
     std::map< RifOdbResultKey, std::vector<std::string> >::const_iterator resMapIt;
-    for (resMapIt = m_resultsMetaData.begin(); resMapIt != m_resultsMetaData.end(); resMapIt++)
+    for (resMapIt = m_resultsMetaData.begin(); resMapIt != m_resultsMetaData.end(); ++resMapIt)
     {
         if (resMapIt->first.resultPostion == position)
         {
diff --git a/ApplicationCode/ReservoirDataModel/RigAccWellFlowCalculator.cpp b/ApplicationCode/ReservoirDataModel/RigAccWellFlowCalculator.cpp
index 8e28b2379e..88d33483aa 100644
--- a/ApplicationCode/ReservoirDataModel/RigAccWellFlowCalculator.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigAccWellFlowCalculator.cpp
@@ -52,7 +52,7 @@ size_t RigEclCellIndexCalculator::resultCellIndex(size_t gridIndex, size_t gridC
 RigAccWellFlowCalculator::RigAccWellFlowCalculator(const std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords,
                                                    const std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds,
                                                    const std::map<QString, const std::vector<double>* >& tracerCellFractionValues,
-                                                   const RigEclCellIndexCalculator cellIndexCalculator,
+                                                   const RigEclCellIndexCalculator& cellIndexCalculator,
                                                    double smallContribThreshold,
                                                    bool isProducer)
                                                  : m_pipeBranchesCLCoords(pipeBranchesCLCoords),
diff --git a/ApplicationCode/ReservoirDataModel/RigAccWellFlowCalculator.h b/ApplicationCode/ReservoirDataModel/RigAccWellFlowCalculator.h
index e779ce2224..03ebdf94bd 100644
--- a/ApplicationCode/ReservoirDataModel/RigAccWellFlowCalculator.h
+++ b/ApplicationCode/ReservoirDataModel/RigAccWellFlowCalculator.h
@@ -59,7 +59,7 @@ public:
     RigAccWellFlowCalculator(const std::vector< std::vector <cvf::Vec3d> >&         pipeBranchesCLCoords,
                              const std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds,
                              const std::map<QString, const std::vector<double>* >&  tracerCellFractionValues,
-                             const RigEclCellIndexCalculator                        cellIndexCalculator,
+                             const RigEclCellIndexCalculator&                       cellIndexCalculator,
                              double smallContribThreshold,
                              bool isProducer);
 
diff --git a/ApplicationCode/ReservoirDataModel/RigSimulationWellCoordsAndMD.cpp b/ApplicationCode/ReservoirDataModel/RigSimulationWellCoordsAndMD.cpp
index 98bbe6952c..f241302508 100644
--- a/ApplicationCode/ReservoirDataModel/RigSimulationWellCoordsAndMD.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigSimulationWellCoordsAndMD.cpp
@@ -24,9 +24,8 @@
 /// 
 //--------------------------------------------------------------------------------------------------
 RigSimulationWellCoordsAndMD::RigSimulationWellCoordsAndMD(const std::vector<cvf::Vec3d>& wellPathPoints)
+: m_wellPathPoints(wellPathPoints)
 {
-    m_wellPathPoints = wellPathPoints;
-
     computeMeasuredDepths();
 }