diff --git a/Source/NativeTest/NativeTest.cpp b/Source/NativeTest/NativeTest.cpp
index b2d766d..e5f31f7 100644
--- a/Source/NativeTest/NativeTest.cpp
+++ b/Source/NativeTest/NativeTest.cpp
@@ -5,26 +5,23 @@
 #include "ProcMonDebugOutput.h"
 
 
-int _tmain(void)
+int wmain()
 {
-    WCHAR szText[100];
+    wchar_t szText[100];
     for (int i = 0; i < 20; i++)
     {
-        _stprintf_s(szText,
-                    _countof(szText),
-                    L"ProcMon Debug Out Test # %d",
-                    i);
+        swprintf_s(szText, L"ProcMon Debug Out Test # %d", i);
         BOOL bRet = ProcMonDebugOutput(szText);
         if (TRUE == bRet)
         {
-            _tprintf(L"Wrote %d\n", i);
+            wprintf(L"Wrote %d\n", i);
         }
         else
         {
-            _tprintf(L"error 0x%x\n", GetLastError());
+            wprintf(L"error 0x%x\n", GetLastError());
         }
         ::Sleep(500);
     }
-    return (0);
+    return 0;
 }
 
diff --git a/Source/NativeTest/stdafx.h b/Source/NativeTest/stdafx.h
index 661cb26..383db6a 100644
--- a/Source/NativeTest/stdafx.h
+++ b/Source/NativeTest/stdafx.h
@@ -8,7 +8,6 @@
 #include "targetver.h"
 
 #include <stdio.h>
-#include <tchar.h>
 #include <windows.h>
 
 
diff --git a/Source/ProcMonDebugOutput-CPP-Review.docx b/Source/ProcMonDebugOutput-CPP-Review.docx
new file mode 100644
index 0000000..00d7591
Binary files /dev/null and b/Source/ProcMonDebugOutput-CPP-Review.docx differ
diff --git a/Source/ProcMonDebugOutput/ProcMonDebugOutput.cpp b/Source/ProcMonDebugOutput/ProcMonDebugOutput.cpp
index f4cb761..44f394e 100644
--- a/Source/ProcMonDebugOutput/ProcMonDebugOutput.cpp
+++ b/Source/ProcMonDebugOutput/ProcMonDebugOutput.cpp
@@ -20,7 +20,7 @@ namespace {
         {
             // I'm attempting the open every time because the user could start 
             // Process Monitor after their process.
-            g_hDevice = ::CreateFile(L"\\\\.\\Global\\ProcmonDebugLogger",
+            g_hDevice = ::CreateFile(LR"(\\.\Global\ProcmonDebugLogger)",
                                      GENERIC_WRITE,
                                      FILE_SHARE_WRITE,
                                      nullptr,