diff --git a/Samples/4_CUDA_Libraries/cuSolverDn_LinearSolver/CMakeLists.txt b/Samples/4_CUDA_Libraries/cuSolverDn_LinearSolver/CMakeLists.txt
index 9ebe07bc..91acf2b1 100644
--- a/Samples/4_CUDA_Libraries/cuSolverDn_LinearSolver/CMakeLists.txt
+++ b/Samples/4_CUDA_Libraries/cuSolverDn_LinearSolver/CMakeLists.txt
@@ -37,6 +37,12 @@ target_link_libraries(cuSolverDn_LinearSolver PRIVATE
 # Copy data files to output directory
 add_custom_command(TARGET cuSolverDn_LinearSolver POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    ${CMAKE_CURRENT_SOURCE_DIR}/*.mtx
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_900_900_crg.mtx
     ${CMAKE_CURRENT_BINARY_DIR}
 )
+add_custom_command(TARGET cuSolverDn_LinearSolver POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    ${CMAKE_CURRENT_SOURCE_DIR}/lap3D_7pt_n20.mtx
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
diff --git a/Samples/4_CUDA_Libraries/cuSolverRf/CMakeLists.txt b/Samples/4_CUDA_Libraries/cuSolverRf/CMakeLists.txt
index 3d686535..9fd599b4 100644
--- a/Samples/4_CUDA_Libraries/cuSolverRf/CMakeLists.txt
+++ b/Samples/4_CUDA_Libraries/cuSolverRf/CMakeLists.txt
@@ -37,6 +37,13 @@ target_link_libraries(cuSolverRf PRIVATE
 # Copy data files to output directory
 add_custom_command(TARGET cuSolverRf POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    ${CMAKE_CURRENT_SOURCE_DIR}/*.mtx
+    ${CMAKE_CURRENT_SOURCE_DIR}/lap2D_5pt_n100.mtx
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+# Copy data files to output directory
+add_custom_command(TARGET cuSolverRf POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    ${CMAKE_CURRENT_SOURCE_DIR}/lap3D_7pt_n20.mtx
     ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/Samples/4_CUDA_Libraries/cuSolverSp_LinearSolver/CMakeLists.txt b/Samples/4_CUDA_Libraries/cuSolverSp_LinearSolver/CMakeLists.txt
index 358b5334..11556326 100644
--- a/Samples/4_CUDA_Libraries/cuSolverSp_LinearSolver/CMakeLists.txt
+++ b/Samples/4_CUDA_Libraries/cuSolverSp_LinearSolver/CMakeLists.txt
@@ -37,6 +37,13 @@ target_link_libraries(cuSolverSp_LinearSolver PRIVATE
 # Copy data files to output directory
 add_custom_command(TARGET cuSolverSp_LinearSolver POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    ${CMAKE_CURRENT_SOURCE_DIR}/*.mtx
+    ${CMAKE_CURRENT_SOURCE_DIR}/lap2D_5pt_n100.mtx
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+# Copy data files to output directory
+add_custom_command(TARGET cuSolverSp_LinearSolver POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    ${CMAKE_CURRENT_SOURCE_DIR}/lap3D_7pt_n20.mtx
     ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/Samples/4_CUDA_Libraries/cuSolverSp_LowlevelCholesky/CMakeLists.txt b/Samples/4_CUDA_Libraries/cuSolverSp_LowlevelCholesky/CMakeLists.txt
index 59a65da4..bfc77fa5 100644
--- a/Samples/4_CUDA_Libraries/cuSolverSp_LowlevelCholesky/CMakeLists.txt
+++ b/Samples/4_CUDA_Libraries/cuSolverSp_LowlevelCholesky/CMakeLists.txt
@@ -37,6 +37,13 @@ target_link_libraries(cuSolverSp_LowlevelCholesky PRIVATE
 # Copy data files to output directory
 add_custom_command(TARGET cuSolverSp_LowlevelCholesky POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    ${CMAKE_CURRENT_SOURCE_DIR}/*.mtx
+    ${CMAKE_CURRENT_SOURCE_DIR}/lap2D_5pt_n100.mtx
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+# Copy data files to output directory
+add_custom_command(TARGET cuSolverSp_LowlevelCholesky POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    ${CMAKE_CURRENT_SOURCE_DIR}/lap3D_7pt_n20.mtx
     ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/Samples/4_CUDA_Libraries/cuSolverSp_LowlevelQR/CMakeLists.txt b/Samples/4_CUDA_Libraries/cuSolverSp_LowlevelQR/CMakeLists.txt
index 43c2c159..268d784a 100644
--- a/Samples/4_CUDA_Libraries/cuSolverSp_LowlevelQR/CMakeLists.txt
+++ b/Samples/4_CUDA_Libraries/cuSolverSp_LowlevelQR/CMakeLists.txt
@@ -37,6 +37,16 @@ target_link_libraries(cuSolverSp_LowlevelQR PRIVATE
 # Copy data files to output directory
 add_custom_command(TARGET cuSolverSp_LowlevelQR POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-    ${CMAKE_CURRENT_SOURCE_DIR}/*.mtx
+    ${CMAKE_CURRENT_SOURCE_DIR}/lap2D_5pt_n32.mtx
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+add_custom_command(TARGET cuSolverSp_LowlevelQR POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    ${CMAKE_CURRENT_SOURCE_DIR}/lap2D_5pt_n100.mtx
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+add_custom_command(TARGET cuSolverSp_LowlevelQR POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    ${CMAKE_CURRENT_SOURCE_DIR}/lap3D_7pt_n20.mtx
     ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/Samples/4_CUDA_Libraries/jitLto/CMakeLists.txt b/Samples/4_CUDA_Libraries/jitLto/CMakeLists.txt
index 978d96de..3f3bec5f 100644
--- a/Samples/4_CUDA_Libraries/jitLto/CMakeLists.txt
+++ b/Samples/4_CUDA_Libraries/jitLto/CMakeLists.txt
@@ -28,7 +28,15 @@ target_include_directories(jitLto PRIVATE
     ${CUDAToolkit_INCLUDE_DIRS}
 )
 
-target_link_libraries(jitLto PRIVATE
-    CUDA::cuda_driver
-    CUDA::nvrtc
-)
+
+
+    target_link_libraries(jitLto PRIVATE
+        CUDA::cuda_driver
+        CUDA::nvrtc
+    )
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    target_link_libraries(jitLto PRIVATE
+        ${CUDAToolkit_LIBRARY_DIR}/libnvJitLink.so
+    )
+endif()	
diff --git a/Samples/4_CUDA_Libraries/simpleCUFFT_2d_MGPU/CMakeLists.txt b/Samples/4_CUDA_Libraries/simpleCUFFT_2d_MGPU/CMakeLists.txt
index ac764679..3fb505a2 100644
--- a/Samples/4_CUDA_Libraries/simpleCUFFT_2d_MGPU/CMakeLists.txt
+++ b/Samples/4_CUDA_Libraries/simpleCUFFT_2d_MGPU/CMakeLists.txt
@@ -18,6 +18,10 @@ include_directories(../../../Common)
 # Add target for simpleCUFFT_2d_MGPU
 add_executable(simpleCUFFT_2d_MGPU simpleCUFFT_2d_MGPU.cu)
 
+if(MSVC)
+    add_compile_definitions(_USE_MATH_DEFINES)
+endif()
+
 target_compile_options(simpleCUFFT_2d_MGPU PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:--extended-lambda>)
 
 target_compile_features(simpleCUFFT_2d_MGPU PRIVATE cxx_std_17 cuda_std_17)
diff --git a/Samples/5_Domain_Specific/BlackScholes_nvrtc/CMakeLists.txt b/Samples/5_Domain_Specific/BlackScholes_nvrtc/CMakeLists.txt
index 1d40f9f0..2438fdc8 100644
--- a/Samples/5_Domain_Specific/BlackScholes_nvrtc/CMakeLists.txt
+++ b/Samples/5_Domain_Specific/BlackScholes_nvrtc/CMakeLists.txt
@@ -26,6 +26,7 @@ set_target_properties(BlackScholes_nvrtc PROPERTIES CUDA_SEPARABLE_COMPILATION O
 
 target_link_libraries(BlackScholes_nvrtc PRIVATE
     CUDA::nvrtc
+    CUDA::cuda_driver
 )
 
 # Copy kernel to the output directory
diff --git a/Samples/5_Domain_Specific/binomialOptions_nvrtc/CMakeLists.txt b/Samples/5_Domain_Specific/binomialOptions_nvrtc/CMakeLists.txt
index 52061df8..b70765f5 100644
--- a/Samples/5_Domain_Specific/binomialOptions_nvrtc/CMakeLists.txt
+++ b/Samples/5_Domain_Specific/binomialOptions_nvrtc/CMakeLists.txt
@@ -26,6 +26,7 @@ set_target_properties(binomialOptions_nvrtc PROPERTIES CUDA_SEPARABLE_COMPILATIO
 
 target_link_libraries(binomialOptions_nvrtc PRIVATE
     CUDA::nvrtc
+    CUDA::cuda_driver
 )
 
 # Copy kernel to the output directory
@@ -33,3 +34,21 @@ add_custom_command(TARGET binomialOptions_nvrtc POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
     ${CMAKE_CURRENT_SOURCE_DIR}/binomialOptions_kernel.cu ${CMAKE_CURRENT_BINARY_DIR}
 )
+
+# Copy header to the output directory
+add_custom_command(TARGET binomialOptions_nvrtc POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    ${CMAKE_CURRENT_SOURCE_DIR}/common_gpu_header.h ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+# Copy header to the output directory
+add_custom_command(TARGET binomialOptions_nvrtc POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    ${CMAKE_CURRENT_SOURCE_DIR}/binomialOptions_common.h ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+# Copy header to the output directory
+add_custom_command(TARGET binomialOptions_nvrtc POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    ${CMAKE_CURRENT_SOURCE_DIR}/realtype.h ${CMAKE_CURRENT_BINARY_DIR}
+)
diff --git a/Samples/5_Domain_Specific/quasirandomGenerator_nvrtc/CMakeLists.txt b/Samples/5_Domain_Specific/quasirandomGenerator_nvrtc/CMakeLists.txt
index f694b5f1..327715d4 100644
--- a/Samples/5_Domain_Specific/quasirandomGenerator_nvrtc/CMakeLists.txt
+++ b/Samples/5_Domain_Specific/quasirandomGenerator_nvrtc/CMakeLists.txt
@@ -26,6 +26,7 @@ set_target_properties(quasirandomGenerator_nvrtc PROPERTIES CUDA_SEPARABLE_COMPI
 
 target_link_libraries(quasirandomGenerator_nvrtc PRIVATE
     CUDA::nvrtc
+    CUDA::cuda_driver
 )
 
 # Copy kernel to the output directory