diff --git a/Common/helper_multiprocess.h b/Common/helper_multiprocess.h
index a6ecb13c..7335e406 100644
--- a/Common/helper_multiprocess.h
+++ b/Common/helper_multiprocess.h
@@ -54,8 +54,8 @@
 #endif
 #include <vector>
 
-// Simple filesystem compatibility for GCC 7.x
-#if defined(__GNUC__) && __GNUC__ < 8
+// Simple filesystem compatibility for GCC 8.x
+#if defined(__GNUC__) && __GNUC__ < 9
     #include <cstdlib>
     #include <string>
     inline std::string getSocketFolder() {
diff --git a/Samples/2_Concepts_and_Techniques/particles/CMakeLists.txt b/Samples/2_Concepts_and_Techniques/particles/CMakeLists.txt
index 777a466d..9e1badf9 100644
--- a/Samples/2_Concepts_and_Techniques/particles/CMakeLists.txt
+++ b/Samples/2_Concepts_and_Techniques/particles/CMakeLists.txt
@@ -39,7 +39,10 @@ if(${OpenGL_FOUND})
         # Add target for particles
         add_executable(particles particleSystem.cpp particleSystem_cuda.cu particles.cpp render_particles.cpp shaders.cpp)
 
-target_compile_options(particles PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:--extended-lambda>)
+target_compile_options(particles PRIVATE
+    $<$<COMPILE_LANGUAGE:CUDA>:--extended-lambda>
+    $<$<AND:$<COMPILE_LANGUAGE:CUDA>,$<BOOL:${MSVC}>>:-Xcompiler="/Zc:preprocessor">
+)
 
 target_compile_features(particles PRIVATE cxx_std_17 cuda_std_17)