diff --git a/program_info/CMakeLists.txt b/program_info/CMakeLists.txt
index 8fb6f68aa..ee2e336b1 100644
--- a/program_info/CMakeLists.txt
+++ b/program_info/CMakeLists.txt
@@ -53,11 +53,11 @@ Section "Visual Studio Runtime"
         StrCpy $vc_redist_exe "vc_redist.x64.exe"
     ${EndIf}
     DetailPrint 'Downloading Microsoft Visual C++ Redistributable...'
-    NScurl::http GET "https://aka.ms/vs/17/release/${vc_redist_exe}" "$INSTDIR\vc_redist\${vc_redist_exe}" /INSIST /CANCEL /Zone.Identifier /END
+    NScurl::http GET "https://aka.ms/vs/17/release/$vc_redist_exe" "$INSTDIR\vc_redist\$vc_redist_exe" /INSIST /CANCEL /Zone.Identifier /END
     Pop $0
     ${If} $0 == "OK"
         DetailPrint "Download successful"
-        ExecWait "$INSTDIR\vc_redist\${vc_redist_exe} /install /passive /norestart\"
+        ExecWait "$INSTDIR\vc_redist\$vc_redist_exe /install /passive /norestart\"
     ${Else}
         DetailPrint "Download failed with error $0"
     ${EndIf}
diff --git a/program_info/win_install.nsi.in b/program_info/win_install.nsi.in
index c0e2b892f..24f6ee4e8 100644
--- a/program_info/win_install.nsi.in
+++ b/program_info/win_install.nsi.in
@@ -2,6 +2,8 @@
 !include "LogicLib.nsh"
 !include "MUI2.nsh"
 
+!include "x64.nsh"
+
 Unicode true
 
 Name "@Launcher_DisplayName@"
@@ -185,7 +187,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "@Launcher_VERSION_NAME4@
 
 !macroend
 
-!macro APP_UNASSOCIATE EXT APP_ID
+!macro APP_UNASSOCIATE EXT APP_ID APP_EXE
 
   # Unregister file type
   ClearErrors
@@ -489,8 +491,8 @@ Section -un.ShellAssoc
   
   !insertmacro APP_TEARDOWN_DEFAULT `${APPID}` `${APPNAME}` `${APPEXE}`
 
-  !insertmacro APP_UNASSOCIATE ".zip" `${APPID}`
-  !insertmacro APP_UNASSOCIATE ".mrpack" `${APPID}`
+  !insertmacro APP_UNASSOCIATE ".zip" `${APPID}` `${APPEXE}`
+  !insertmacro APP_UNASSOCIATE ".mrpack" `${APPID}` `${APPEXE}`
 
   !insertmacro NotifyShell_AssocChanged
 SectionEnd