diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt
index 1db2e1b44b..7b13bdf5f1 100644
--- a/ApplicationCode/CMakeLists.txt
+++ b/ApplicationCode/CMakeLists.txt
@@ -321,6 +321,8 @@ if (MSVC)
     endif(RESINSIGHT_ENABLE_GRPC)
 elseif (APPLE)
     set( EXE_FILES MACOSX_BUNDLE)
+else()
+	set_source_files_properties(${GRPC_CPP_SOURCES} PROPERTIES COMPILE_FLAGS "-Woverloaded-virtual")
 endif()
 set( EXE_FILES
     ${EXE_FILES}
diff --git a/ApplicationCode/GrpcInterface/RiaGrpcCallbacks.inl b/ApplicationCode/GrpcInterface/RiaGrpcCallbacks.inl
index 059eb72d2c..4bc11a8bdb 100644
--- a/ApplicationCode/GrpcInterface/RiaGrpcCallbacks.inl
+++ b/ApplicationCode/GrpcInterface/RiaGrpcCallbacks.inl
@@ -298,7 +298,7 @@ void RiaGrpcClientStreamCallback<ServiceT, RequestT, ReplyT, StateHandlerT>::onI
     this->setNextCallState(RiaAbstractGrpcCallback::INIT_REQUEST_COMPLETED);
     // The read call will start reading the request data and push this callback back onto the command queue
     // when the read call is completed.
-    m_reader.Read(&m_request, this);
+    m_reader.Read(&this->m_request, this);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -320,7 +320,7 @@ void RiaGrpcClientStreamCallback<ServiceT, RequestT, ReplyT, StateHandlerT>::onI
     }
 
     // Start reading and push this back onto the command queue.
-    m_reader.Read(&m_request, this);
+    m_reader.Read(&this->m_request, this);
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/GrpcInterface/RiaGrpcPropertiesService.cpp b/ApplicationCode/GrpcInterface/RiaGrpcPropertiesService.cpp
index 8d3bcf06b4..07817130c8 100644
--- a/ApplicationCode/GrpcInterface/RiaGrpcPropertiesService.cpp
+++ b/ApplicationCode/GrpcInterface/RiaGrpcPropertiesService.cpp
@@ -75,7 +75,7 @@ public:
 
             if (resultData->ensureKnownResultLoaded(resAddr))
             {
-                if (timeStep < (int)resultData->timeStepCount(resAddr))
+                if (timeStep < resultData->timeStepCount(resAddr))
                 {
                     initResultAccess(caseData, request->grid_index(), porosityModel, timeStep, resAddr);
                     return grpc::Status::OK;