diff --git a/Source/build.cpp b/Source/build.cpp
index 97391326..85bbce1c 100644
--- a/Source/build.cpp
+++ b/Source/build.cpp
@@ -1742,11 +1742,11 @@ again:
             else
               p->parms[4]--;
 
-            DefineInnerLangString(NLF_SPACE_AVAIL, 0);
-            DefineInnerLangString(NLF_SPACE_REQ, 0);
-            DefineInnerLangString(NLF_BYTE, 0);
-            DefineInnerLangString(NLF_KILO, 0);
-            DefineInnerLangString(NLF_MEGA, 0);
+            DefineInnerLangString(NLF_SPACE_AVAIL);
+            DefineInnerLangString(NLF_SPACE_REQ);
+            DefineInnerLangString(NLF_BYTE);
+            DefineInnerLangString(NLF_KILO);
+            DefineInnerLangString(NLF_MEGA);
             DefineInnerLangString(NLF_GIGA);
 #ifdef NSIS_CONFIG_LOG
             DefineInnerLangString(NLF_LOG_INSTALL_PROCESS);
diff --git a/Source/exehead/Main.c b/Source/exehead/Main.c
index e2072bd5..f86ddf22 100644
--- a/Source/exehead/Main.c
+++ b/Source/exehead/Main.c
@@ -73,7 +73,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst,LPSTR lpszCmdParam,
   // g_caption is used as a temp var here
   if (!my_GetTempFileName(g_caption, state_temp_dir))
   {
-    mystrcpy(state_temp_dir + GetWindowsDirectory(state_temp_dir, sizeof(state_temp_dir)), "\\Temp");
+    GetWindowsDirectory(state_temp_dir, sizeof(state_temp_dir));
+    lstrcat(state_temp_dir, "\\Temp");
     validate_filename(state_temp_dir);
     CreateDirectory(state_temp_dir, NULL);
     if (!my_GetTempFileName(g_caption, state_temp_dir))