diff --git a/Modules/CMakeVS8FindMake.cmake b/Modules/CMakeVS8FindMake.cmake
index ec3a3ca43..59d38b153 100644
--- a/Modules/CMakeVS8FindMake.cmake
+++ b/Modules/CMakeVS8FindMake.cmake
@@ -1,5 +1,5 @@
 FIND_PROGRAM(CMAKE_MAKE_PROGRAM
-  NAMES VCExpress
+  NAMES devenv VCExpress
   PATHS
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VS;EnvironmentDirectory]
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup;Dbghelp_path]
diff --git a/Source/MFCDialog/CMakeSetupDialog.cpp b/Source/MFCDialog/CMakeSetupDialog.cpp
index fc2a6dd6c..594d060d6 100644
--- a/Source/MFCDialog/CMakeSetupDialog.cpp
+++ b/Source/MFCDialog/CMakeSetupDialog.cpp
@@ -1269,8 +1269,9 @@ int CMakeSetupDialog::CreateShortcut()
       }
     
     // Ensure that the string consists of ANSI characters.
-    WORD wsz[MAX_PATH]; 
-    MultiByteToWideChar(CP_ACP, 0, link_name, -1, wsz, MAX_PATH);
+    WORD wszAr[MAX_PATH]; 
+    LPWSTR wsz = (LPWSTR)wszAr;
+    MultiByteToWideChar(CP_ACP, 0, link_name, -1, (LPWSTR)(wsz), MAX_PATH);
 
     // Save the shortcut via the IPersistFile::Save member function.
     hres = ppf->Save(wsz, TRUE);