diff --git a/Main.cpp b/Main.cpp
index f359c4b..a9d1d19 100644
--- a/Main.cpp
+++ b/Main.cpp
@@ -13,6 +13,7 @@
 #pragma comment(lib, "Version.lib")
 #pragma comment(lib, "crypt32.lib")
 #pragma comment(lib, "shlwapi.lib")
+#pragma comment(lib, "bcrypt.lib")           // Required by the Rust runtime
 
 HANDLE g_hHeap = NULL;
 HANDLE g_hStdOut;
diff --git a/ORADAD.rc b/ORADAD.rc
index 3092a3a..38b2cf8 100644
Binary files a/ORADAD.rc and b/ORADAD.rc differ
diff --git a/XML.cpp b/XML.cpp
index bdf7705..de74528 100644
--- a/XML.cpp
+++ b/XML.cpp
@@ -845,7 +845,7 @@ pAddClassToRequest (
          hr = pXmlSubNode->get_attributes(&pXmlNodeAttributeAttributes);
          hr = pXmlNodeAttributeAttributes->getNamedItem((BSTR)L"name", &pXmlNodeAttributeName);
          hr = pXmlNodeAttributeName->get_text(&szName);
-         szAttributes[i] = (LPWSTR)szName;
+         szAttributes[dwAttributesCount] = (LPWSTR)szName;
          dwAttributesCount++;
 
          _SafeCOMRelease(pXmlNodeAttributeName);