diff --git a/C++/cudaAccelerator/cudaAccelerator/dllmain.cpp b/C++/cudaAccelerator/cudaAccelerator/dllmain.cpp
index 87f060c6b..c37fbb0f8 100644
--- a/C++/cudaAccelerator/cudaAccelerator/dllmain.cpp
+++ b/C++/cudaAccelerator/cudaAccelerator/dllmain.cpp
@@ -990,8 +990,8 @@ void create_and_insert_cache(const std::vector<std::string>& records_vec, const
     cache->str_data.str_total_bytes = alloc_bytes;
     cache->str_data.str_remain_blank_bytes = CACHE_REMAIN_BLANK_SIZE_IN_BYTES;
 
-    auto str_addr_capacity = record_count + CACHE_REMAIN_BLANK_SIZE_IN_BYTES / MAX_PATH_LENGTH;
-    auto str_addr_alloc_size = str_addr_capacity * sizeof(size_t);
+    const auto str_addr_capacity = record_count + CACHE_REMAIN_BLANK_SIZE_IN_BYTES / MAX_PATH_LENGTH;
+    const auto str_addr_alloc_size = str_addr_capacity * sizeof(size_t);
     gpuErrchk(cudaMalloc(&cache->str_data.dev_str_addr, str_addr_alloc_size), true, nullptr);
     gpuErrchk(cudaMemset(cache->str_data.dev_str_addr, 0, str_addr_alloc_size), true, nullptr);
     cache->str_data.str_addr_capacity = str_addr_capacity;
diff --git a/C++/openclAccelerator/src/file_utils.cpp b/C++/openclAccelerator/src/file_utils.cpp
index 3a90d556c..8880acf26 100644
--- a/C++/openclAccelerator/src/file_utils.cpp
+++ b/C++/openclAccelerator/src/file_utils.cpp
@@ -25,7 +25,7 @@ std::wstring string2wstring(const std::string& str)
 int is_dir_or_file(const char* path)
 {
     const auto w_path = string2wstring(path);
-    DWORD dwAttrib = GetFileAttributes(w_path.c_str());
+    const DWORD dwAttrib = GetFileAttributes(w_path.c_str());
     if (dwAttrib != INVALID_FILE_ATTRIBUTES)
     {
         if (dwAttrib & FILE_ATTRIBUTE_DIRECTORY)
diff --git a/src/main/resources/win32-native/cudaAccelerator.dll b/src/main/resources/win32-native/cudaAccelerator.dll
index 4c97c9f6f..3a0680139 100644
Binary files a/src/main/resources/win32-native/cudaAccelerator.dll and b/src/main/resources/win32-native/cudaAccelerator.dll differ
diff --git a/src/main/resources/win32-native/openclAccelerator.dll b/src/main/resources/win32-native/openclAccelerator.dll
index 0a94dd26f..a5fbd3eca 100644
Binary files a/src/main/resources/win32-native/openclAccelerator.dll and b/src/main/resources/win32-native/openclAccelerator.dll differ