diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c11640e..b70a8d74 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,11 @@ cmake_minimum_required(VERSION 3.15)
 
 project(ospray_studio VERSION 1.2.0 LANGUAGES CXX C)
 
+# https://gitlab.kitware.com/cmake/cmake/-/issues/18837
+if (MSVC AND (MSVC_VERSION GREATER_EQUAL 1914))
+  add_compile_options(/Zc:__cplusplus)
+endif()
+
 include(GNUInstallDirs)
 include(ProcessorCount)
 
diff --git a/sg/generator/UnstructuredVol.cpp b/sg/generator/UnstructuredVol.cpp
index 07745de1..d7df0424 100644
--- a/sg/generator/UnstructuredVol.cpp
+++ b/sg/generator/UnstructuredVol.cpp
@@ -166,7 +166,7 @@ void UnstructuredVol::generateData()
   std::vector<uint32_t> cells = {0, 8, 14, 18};
 
   // define cell types
-  std::vector<OSPUnstructuredCellType> cellTypes = {
+  std::vector<uint8_t> cellTypes = {
       OSP_HEXAHEDRON, OSP_WEDGE, OSP_TETRAHEDRON, OSP_PYRAMID};
 
   auto &volume = tf.createChild("unstructured_volume", "volume_unstructured");