diff --git a/src/util/util_env.cpp b/src/util/util_env.cpp
index c4a02477..3eab0506 100644
--- a/src/util/util_env.cpp
+++ b/src/util/util_env.cpp
@@ -1,4 +1,5 @@
 #include "util_env.h"
+#include <vector>
 
 #include "./com/com_include.h"
 
@@ -7,12 +8,12 @@ namespace dxvk::env {
   std::string getEnvVar(const wchar_t* name) {
     DWORD len = ::GetEnvironmentVariableW(name, nullptr, 0);
     
-    std::wstring result;
+    std::vector<WCHAR> result;
     
     while (len > result.size()) {
       result.resize(len);
       len = ::GetEnvironmentVariableW(
-        name, &result.at(0), result.size());
+        name, result.data(), result.size());
     }
     
     result.resize(len);
@@ -21,10 +22,10 @@ namespace dxvk::env {
   
   
   std::string getExeName() {
-    std::wstring exePath;
+    std::vector<WCHAR> exePath;
     exePath.resize(MAX_PATH + 1);
     
-    DWORD len = ::GetModuleFileNameW(NULL, &exePath.at(0), MAX_PATH);
+    DWORD len = ::GetModuleFileNameW(NULL, exePath.data(), MAX_PATH);
     exePath.resize(len);
     
     std::string fullPath = str::fromws(exePath.data());