diff --git a/src/iso.c b/src/iso.c
index 8019fbb0..09def36e 100644
--- a/src/iso.c
+++ b/src/iso.c
@@ -1104,7 +1104,7 @@ out:
 			// Extract all of the isolinux.bin files we found to identify their versions
 			for (i=0; i<isolinux_path.Index; i++) {
 				char isolinux_tmp[MAX_PATH];
-				static_sprintf(isolinux_tmp, "%s\\isolinux.tmp", temp_dir);
+				static_sprintf(isolinux_tmp, "%sisolinux.tmp", temp_dir);
 				size = (size_t)ExtractISOFile(src_iso, isolinux_path.String[i], isolinux_tmp, FILE_ATTRIBUTE_NORMAL);
 				if (size == 0) {
 					uprintf("  Could not access %s", isolinux_path.String[i]);
diff --git a/src/msapi_utf8.h b/src/msapi_utf8.h
index a44ff589..6ff77437 100644
--- a/src/msapi_utf8.h
+++ b/src/msapi_utf8.h
@@ -724,6 +724,21 @@ static __inline DWORD GetModuleFileNameExU(HANDLE hProcess, HMODULE hModule, cha
 	return ret;
 }
 
+static __inline DWORD GetFinalPathNameByHandleU(HANDLE hFile, char* lpszFilePath, DWORD cchFilePath, DWORD dwFlags)
+{
+	DWORD ret = 0, err = ERROR_INVALID_DATA;
+	walloc(lpszFilePath, cchFilePath);
+	ret = GetFinalPathNameByHandleW(hFile, wlpszFilePath, cchFilePath, dwFlags);
+	err = GetLastError();
+	if ((ret != 0)
+		&& ((ret = wchar_to_utf8_no_alloc(wlpszFilePath, lpszFilePath, cchFilePath)) == 0)) {
+		err = GetLastError();
+	}
+	wfree(lpszFilePath);
+	SetLastError(err);
+	return ret;
+}
+
 static __inline DWORD GetFileVersionInfoSizeU(const char* lpFileName, LPDWORD lpdwHandle)
 {
 	DWORD ret = 0, err = ERROR_INVALID_DATA;
diff --git a/src/rufus.c b/src/rufus.c
index 3ed3c452..7bee7fdc 100755
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -3398,9 +3398,30 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 		uprintf("Could not get system directory: %s", WindowsErrorString());
 		static_strcpy(system_dir, "C:\\Windows\\System32");
 	}
+	// Per documentation, the returned string ends with a backslash
 	if (GetTempPathU(sizeof(temp_dir), temp_dir) == 0) {
 		uprintf("Could not get temp directory: %s", WindowsErrorString());
 		static_strcpy(temp_dir, ".\\");
+	} else {
+		// Some folks have found nothing better than configure their Windows installation to use
+		// a symlink for their temp dir, and it so happens that the Windows WIM mounting facility,
+		// which we need for applying the WUE options, can't handle symlinked directories. So we
+		// *attempt* to resolve the actual symlinked temp dir for this super limited number of
+		// users, with the hope that doing so is not going to break stuff elsewhere...
+		HANDLE handle = CreateFileU(temp_dir, GENERIC_READ, FILE_SHARE_READ, NULL,
+			OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+		// GetFinalPathNameByHandle returns a UNC path, which should be prefixed by '\\?\' or '\\.\'
+		if ((GetFinalPathNameByHandleU(handle, temp_dir, sizeof(temp_dir), FILE_NAME_OPENED) == 0) ||
+			((strstr(temp_dir, "\\\\?\\") != temp_dir) && (strstr(temp_dir, "\\\\.\\") != temp_dir))) {
+			uprintf("Could not get actual temp directory: %s", WindowsErrorString());
+			static_strcpy(temp_dir, ".\\");
+		} else {
+			// Need to remove the '\\?\' prefix or else we'll get issues with the Fido icon
+			strcpy(temp_dir, &temp_dir[4]);
+			// And me must re-append the '\' that gets removed by GetFinalPathNameByHandle()
+			static_strcat(temp_dir, "\\");
+		}
+		CloseHandle(handle);
 	}
 	if (!SHGetSpecialFolderPathU(NULL, app_data_dir, CSIDL_LOCAL_APPDATA, FALSE)) {
 		uprintf("Could not get app data directory: %s", WindowsErrorString());
diff --git a/src/rufus.rc b/src/rufus.rc
index 5af96e98..bf2a0136 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 4.2.2046"
+CAPTION "Rufus 4.2.2047"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -392,8 +392,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,2,2046,0
- PRODUCTVERSION 4,2,2046,0
+ FILEVERSION 4,2,2047,0
+ PRODUCTVERSION 4,2,2047,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -411,13 +411,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "4.2.2046"
+            VALUE "FileVersion", "4.2.2047"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2023 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-4.2.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "4.2.2046"
+            VALUE "ProductVersion", "4.2.2047"
         END
     END
     BLOCK "VarFileInfo"