diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2befb7a..a199a9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,9 @@
 cmake_minimum_required(VERSION 3.10 FATAL_ERROR) # because of c++17
 project(athena)
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
+if (NOT MSVC)
+  set(CMAKE_CXX_STANDARD 20)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+endif()
 
 ##################
 # Athena Version #
diff --git a/atdna/FindLLVM.cmake b/atdna/FindLLVM.cmake
index e76c075..d10022a 100644
--- a/atdna/FindLLVM.cmake
+++ b/atdna/FindLLVM.cmake
@@ -30,7 +30,7 @@
 set(LLVM_ROOT_DIR "" CACHE PATH "Location of LLVM development root")
 set(LLVM_FIND_COMPONENTS "")
 if(WIN32)
-get_filename_component(LLVM_ROOT_DIR [HKEY_LOCAL_MACHINE\\Software\\LLVM\\LLVM] ABSOLUTE)
+get_filename_component(LLVM_ROOT_DIR [HKEY_LOCAL_MACHINE\\Software\\LLVM\\LLVM] ABSOLUTE CACHE)
 endif()
 
 set(llvm_config_names llvm-config-3.9 llvm-config39