diff --git a/Common/helper_cuda.h b/Common/helper_cuda.h
index dc0efc46..401c41b2 100644
--- a/Common/helper_cuda.h
+++ b/Common/helper_cuda.h
@@ -138,26 +138,26 @@ static const char *_cudaGetErrorEnum(cufftResult error) {
     case CUFFT_UNALIGNED_DATA:
       return "CUFFT_UNALIGNED_DATA";
 
-    case CUFFT_INCOMPLETE_PARAMETER_LIST:
-      return "CUFFT_INCOMPLETE_PARAMETER_LIST";
-
     case CUFFT_INVALID_DEVICE:
       return "CUFFT_INVALID_DEVICE";
 
-    case CUFFT_PARSE_ERROR:
-      return "CUFFT_PARSE_ERROR";
-
     case CUFFT_NO_WORKSPACE:
       return "CUFFT_NO_WORKSPACE";
 
     case CUFFT_NOT_IMPLEMENTED:
       return "CUFFT_NOT_IMPLEMENTED";
 
-    case CUFFT_LICENSE_ERROR:
-      return "CUFFT_LICENSE_ERROR";
+    case CUFFT_MISSING_DEPENDENCY:
+      return "CUFFT_MISSING_DEPENDENCY";
 
-    case CUFFT_NOT_SUPPORTED:
-      return "CUFFT_NOT_SUPPORTED";
+    case CUFFT_NVRTC_FAILURE:
+      return "CUFFT_NVRTC_FAILURE";
+
+    case CUFFT_NVJITLINK_FAILURE:
+      return "CUFFT_NVJITLINK_FAILURE";
+
+    case CUFFT_NVSHMEM_FAILURE:
+      return "CUFFT_NVSHMEM_FAILURE";
   }
 
   return "<unknown>";
diff --git a/Samples/0_Introduction/matrixMul_nvrtc/CMakeLists.txt b/Samples/0_Introduction/matrixMul_nvrtc/CMakeLists.txt
index 2d038774..1e7f6618 100644
--- a/Samples/0_Introduction/matrixMul_nvrtc/CMakeLists.txt
+++ b/Samples/0_Introduction/matrixMul_nvrtc/CMakeLists.txt
@@ -45,10 +45,10 @@ add_custom_command(TARGET matrixMul_nvrtc POST_BUILD
 
 add_custom_command(TARGET matrixMul_nvrtc POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_directory
-    ${CUDAToolkit_BIN_DIR}/../include/nv ${CMAKE_CURRENT_BINARY_DIR}/nv
+    ${CUDAToolkit_BIN_DIR}/../include/cccl/nv ${CMAKE_CURRENT_BINARY_DIR}/nv
 )
 
 add_custom_command(TARGET matrixMul_nvrtc POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_directory
-    ${CUDAToolkit_BIN_DIR}/../include/cuda ${CMAKE_CURRENT_BINARY_DIR}/cuda
+    ${CUDAToolkit_BIN_DIR}/../include/cccl/cuda ${CMAKE_CURRENT_BINARY_DIR}/cuda
 )
diff --git a/Samples/8_Platform_Specific/Tegra/CMakeLists.txt b/Samples/8_Platform_Specific/Tegra/CMakeLists.txt
index c1a65040..356c2a13 100644
--- a/Samples/8_Platform_Specific/Tegra/CMakeLists.txt
+++ b/Samples/8_Platform_Specific/Tegra/CMakeLists.txt
@@ -5,7 +5,7 @@ add_subdirectory(cuDLAHybridMode)
 add_subdirectory(cuDLALayerwiseStatsHybrid)
 add_subdirectory(cuDLALayerwiseStatsStandalone)
 add_subdirectory(cuDLAStandaloneMode)
-#add_subdirectory(EGLSync_CUDAEvent_Interop)
+add_subdirectory(EGLSync_CUDAEvent_Interop)
 add_subdirectory(fluidsGLES)
 add_subdirectory(nbody_opengles)
 add_subdirectory(simpleGLES)
diff --git a/Samples/8_Platform_Specific/Tegra/EGLSync_CUDAEvent_Interop/CMakeLists.txt b/Samples/8_Platform_Specific/Tegra/EGLSync_CUDAEvent_Interop/CMakeLists.txt
index 90ad2f3b..b75b8356 100644
--- a/Samples/8_Platform_Specific/Tegra/EGLSync_CUDAEvent_Interop/CMakeLists.txt
+++ b/Samples/8_Platform_Specific/Tegra/EGLSync_CUDAEvent_Interop/CMakeLists.txt
@@ -17,7 +17,7 @@ else()
 endif()
 
 # Include directories and libraries
-include_directories(../../../Common)
+include_directories(../../../../Common)
 
 find_package(EGL)
 find_package(X11)
diff --git a/Samples/8_Platform_Specific/Tegra/EGLSync_CUDAEvent_Interop/EGLSync_CUDAEvent_Interop.cu b/Samples/8_Platform_Specific/Tegra/EGLSync_CUDAEvent_Interop/EGLSync_CUDAEvent_Interop.cu
index 1c459c5c..9e709a16 100644
--- a/Samples/8_Platform_Specific/Tegra/EGLSync_CUDAEvent_Interop/EGLSync_CUDAEvent_Interop.cu
+++ b/Samples/8_Platform_Specific/Tegra/EGLSync_CUDAEvent_Interop/EGLSync_CUDAEvent_Interop.cu
@@ -259,7 +259,8 @@ void checkSync(int argc, char **argv)
     unsigned char *pSurf_read = NULL, *pSurf_write = NULL;
     int            integrated;
 
-    CUresult status = CUDA_SUCCESS;
+    CUresult          status          = CUDA_SUCCESS;
+    CUctxCreateParams ctxCreateParams = {};
 
     // Init values for variables
     x = y = 0;
@@ -269,7 +270,7 @@ void checkSync(int argc, char **argv)
     }
     device = findCudaDeviceDRV(argc, (const char **)argv);
 
-    if (CUDA_SUCCESS != (status = cuCtxCreate(&context, 0, device))) {
+    if (CUDA_SUCCESS != (status = cuCtxCreate(&context, &ctxCreateParams, 0, device))) {
         printf("failed to create CUDA context\n");
     }
     cuCtxPushCurrent(context);