diff --git a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswTableData.cpp b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswTableData.cpp
index bb1509ce39..bea3a37600 100644
--- a/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswTableData.cpp
+++ b/ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswTableData.cpp
@@ -207,12 +207,13 @@ std::vector<WellPathCellIntersectionInfo>
 
         WellPathCellIntersectionInfo extraIntersection;
 
-        extraIntersection.globCellIndex         = std::numeric_limits<size_t>::max();
-        extraIntersection.startPoint            = intersectionPoint;
-        extraIntersection.endPoint              = firstIntersection.startPoint;
-        extraIntersection.startMD               = initialMD;
-        extraIntersection.endMD                 = firstIntersection.startMD;
-        extraIntersection.intersectedCellFaceIn = cvf::StructGridInterface::NO_FACE;
+        extraIntersection.globCellIndex          = std::numeric_limits<size_t>::max();
+        extraIntersection.startPoint             = intersectionPoint;
+        extraIntersection.endPoint               = firstIntersection.startPoint;
+        extraIntersection.startMD                = initialMD;
+        extraIntersection.endMD                  = firstIntersection.startMD;
+        extraIntersection.intersectedCellFaceIn  = cvf::StructGridInterface::NO_FACE;
+        extraIntersection.intersectedCellFaceOut = cvf::StructGridInterface::NO_FACE;
 
         if ( firstIntersection.intersectedCellFaceIn != cvf::StructGridInterface::NO_FACE )
 
diff --git a/ApplicationLibCode/ReservoirDataModel/RigVfpTables.h b/ApplicationLibCode/ReservoirDataModel/RigVfpTables.h
index 8216e32095..45445b265c 100644
--- a/ApplicationLibCode/ReservoirDataModel/RigVfpTables.h
+++ b/ApplicationLibCode/ReservoirDataModel/RigVfpTables.h
@@ -79,11 +79,11 @@ struct VfpTableSelection
 
 struct VfpValueSelection
 {
-    double flowRateValue;
-    double thpValue;
-    double artificialLiftQuantityValue;
-    double waterCutValue;
-    double gasLiquidRatioValue;
+    double flowRateValue               = 0.0;
+    double thpValue                    = 0.0;
+    double artificialLiftQuantityValue = 0.0;
+    double waterCutValue               = 0.0;
+    double gasLiquidRatioValue         = 0.0;
 
     std::vector<double> familyValues;
 };
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55ceb795bd..ccd85a3505 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,7 +67,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 set(VIZ_MODULES_FOLDER_NAME Fwk/VizFwk)
 
-message(STATUS "Set CEE_USE_QT6 to ON")
+# Instruct cvf to use Qt6
 set(CEE_USE_QT5 OFF)
 set(CEE_USE_QT6 ON)
 
@@ -141,7 +141,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     )
   endif()
   set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -g3 -O0 -DDEBUG -D_DEBUG")
-  set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNO_DEBUG")
 endif()
 
 include(cmake/StdStacktrace.cmake)
diff --git a/Fwk/AppFwk/CMakeLists.txt b/Fwk/AppFwk/CMakeLists.txt
index 061cd4399c..5117fcf6ec 100644
--- a/Fwk/AppFwk/CMakeLists.txt
+++ b/Fwk/AppFwk/CMakeLists.txt
@@ -19,14 +19,9 @@ if(MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 endif()
 
-# Qt
-if(NOT DEFINED (CEE_USE_QT5))
-  option(CEE_USE_QT5 "Use Qt5" ON)
-endif(NOT DEFINED (CEE_USE_QT5))
-
-if(NOT DEFINED (CEE_USE_QT6))
-  option(CEE_USE_QT6 "Use Qt6" OFF)
-endif(NOT DEFINED (CEE_USE_QT6))
+# Instruct cvf to use Qt6
+set(CEE_USE_QT5 OFF)
+set(CEE_USE_QT6 ON)
 
 # CeeViz is not available here, exclude it from the build
 set(CAF_EXCLUDE_CVF ON)
diff --git a/Fwk/CMakeLists.txt b/Fwk/CMakeLists.txt
index 92d24fc1fb..5eaeb1aaa7 100644
--- a/Fwk/CMakeLists.txt
+++ b/Fwk/CMakeLists.txt
@@ -29,7 +29,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
       "-DCVF_LINUX -pipe -Wextra -Woverloaded-virtual -Wformat -Wno-unused-parameter"
   )
   set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -g3 -O0 -DDEBUG -D_DEBUG")
-  set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNO_DEBUG")
 endif()
 
   find_package(