diff --git a/src/App/Project.hpp b/src/App/Project.hpp
index e22241f..28cd3cf 100644
--- a/src/App/Project.hpp
+++ b/src/App/Project.hpp
@@ -12,5 +12,5 @@ constexpr auto Author = "psiberx";
 constexpr auto NameW = L"TweakXL";
 constexpr auto AuthorW = L"psiberx";
 
-constexpr auto Version = semver::from_string_noexcept("1.8.5").value();
+constexpr auto Version = semver::from_string_noexcept("1.8.6").value();
 }
diff --git a/src/App/Tweaks/Declarative/Yaml/YamlReader.Template.cpp b/src/App/Tweaks/Declarative/Yaml/YamlReader.Template.cpp
index a1dd90a..05acdf4 100644
--- a/src/App/Tweaks/Declarative/Yaml/YamlReader.Template.cpp
+++ b/src/App/Tweaks/Declarative/Yaml/YamlReader.Template.cpp
@@ -166,7 +166,7 @@ void ProcessNode(const YAML::Node& aNode, const InstanceData& aInstanceData)
     }
     case YAML::NodeType::Map:
     {
-        for (auto& nodeIt : aNode)
+        for (const auto& nodeIt : aNode)
         {
             ProcessNode(nodeIt.second, aInstanceData);
         }
@@ -177,7 +177,7 @@ void ProcessNode(const YAML::Node& aNode, const InstanceData& aInstanceData)
         if (aNode.size() == 0)
             break;
 
-        YAML::Node expandedNode;
+        YAML::Node expandedNode{YAML::NodeType::Undefined};
 
         for (std::size_t i = 0; i < aNode.size(); ++i)
         {
diff --git a/src/App/Version.rc b/src/App/Version.rc
index 6fc5bd7..c83d01b 100644
--- a/src/App/Version.rc
+++ b/src/App/Version.rc
@@ -1,9 +1,9 @@
-#define VER_PRODUCTVERSION     1,8,5,0
-#define VER_FILEVERSION        1,8,5,2404270852
+#define VER_PRODUCTVERSION     1,8,6,0
+#define VER_FILEVERSION        1,8,6,2405081442
 
 #define VER_PRODUCTNAME_STR    "TweakXL\0"
-#define VER_PRODUCTVERSION_STR "1.8.5\0"
-#define VER_FILEVERSION_STR    "1.8.5.2404270852\0"
+#define VER_PRODUCTVERSION_STR "1.8.6\0"
+#define VER_FILEVERSION_STR    "1.8.6.2405081442\0"
 
 1 VERSIONINFO
 FILEVERSION     VER_FILEVERSION
diff --git a/xmake.lua b/xmake.lua
index 73302b3..e4f3899 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -1,7 +1,7 @@
 set_xmakever("2.5.9")
 
 set_project("TweakXL")
-set_version("1.8.5", {build = "%y%m%d%H%M"})
+set_version("1.8.6", {build = "%y%m%d%H%M"})
 
 set_arch("x64")
 set_languages("cxx2a")