diff --git a/cmake/DetectOptions.cmake b/cmake/DetectOptions.cmake
index 9e1958ce9d..24e8470b40 100644
--- a/cmake/DetectOptions.cmake
+++ b/cmake/DetectOptions.cmake
@@ -607,13 +607,13 @@ elseif(ADIOS2_USE_Campaign)
 endif()  
 
 # KVCache
-if(ADIOS2_USE_Cache STREQUAL AUTO)
+if(ADIOS2_USE_KVCACHE STREQUAL AUTO)
     find_package(hiredis)
     if (hiredis_FOUND)
       message(STATUS "hiredis found. Turn on KVCache")
       set(ADIOS2_HAVE_KVCACHE TRUE)
     endif()
-elseif(ADIOS2_USE_Cache)
+elseif(ADIOS2_USE_KVCACHE)
     find_package(hiredis REQUIRED)
     if (hiredis_FOUND)
       message(STATUS "hiredis found. Turn on KVCache")
diff --git a/scripts/build_scripts/build-adios2-kvcache.sh b/scripts/build_scripts/build-adios2-kvcache.sh
index 4d99867412..b7ebc51553 100644
--- a/scripts/build_scripts/build-adios2-kvcache.sh
+++ b/scripts/build_scripts/build-adios2-kvcache.sh
@@ -47,7 +47,7 @@ build_cache() {
     fi
 
     cd "${BUILD_DIR}" || exit
-    cmake .. -DADIOS2_USE_Cache=ON \
+    cmake .. -DADIOS2_USE_KVCACHE=ON \
             -DADIOS2_USE_Python=ON \
             -DCMAKE_PREFIX_PATH="${SW_DIR}/hiredis" \
             -DCMAKE_INSTALL_PREFIX="${SW_DIR}"/adios2
diff --git a/source/adios2/toolkit/kvcache/KVCacheCommon.cpp b/source/adios2/toolkit/kvcache/KVCacheCommon.cpp
index 2dc094ce4f..5d24dee1e7 100644
--- a/source/adios2/toolkit/kvcache/KVCacheCommon.cpp
+++ b/source/adios2/toolkit/kvcache/KVCacheCommon.cpp
@@ -119,7 +119,7 @@ void KVCacheCommon::KeyPrefixExistence(const std::string &key_prefix,
     }
     else
     {
-        for (int i = 0; i < m_redisReply->elements; i++)
+        for (size_t i = 0; i < m_redisReply->elements; i++)
         {
             keys.insert(m_redisReply->element[i]->str);
         }