diff --git a/src/format.c b/src/format.c
index a18072cb..f9e70a72 100644
--- a/src/format.c
+++ b/src/format.c
@@ -1327,7 +1327,7 @@ int SetWinToGoIndex(void)
 	if (i > 1)
 		i = Selection(lmprintf(MSG_291), lmprintf(MSG_292), version_name.String, i);
 	if (i < 0) {
-		wintogo_index = -1;
+		wintogo_index = -2;	// Cancelled by the user
 	} else if (i == 0) {
 		wintogo_index = 1;
 	} else {
@@ -1442,12 +1442,12 @@ static BOOL SetupWinToGo(const char* drive_name, BOOL use_ms_efi)
 	// Also, since Rufus should (usually) be running as a 32 bit app, on 64 bit systems, we need to use
 	// 'C:\Windows\Sysnative' and not 'C:\Windows\System32' to invoke bcdboot, as 'C:\Windows\System32'
 	// will get converted to 'C:\Windows\SysWOW64' behind the scenes, and ther is no bcdboot.exe there.
-	uprintf("Enabling boot...");
 	static_sprintf(cmd, "%s\\bcdboot.exe %s\\Windows /v /f ALL /s %s", sysnative_dir,
 		drive_name, (use_ms_efi)?ms_efi:drive_name);
+	uprintf("Enabling boot using command '%s'", cmd);
 	if (RunCommand(cmd, sysnative_dir, usb_debug) != 0) {
 		// Try to continue... but report a failure
-		uprintf("Failed to enable boot using command '%s'", cmd);
+		uprintf("Failed to enable boot");
 		FormatStatus = ERROR_SEVERITY_ERROR | FAC(FACILITY_STORAGE) | APPERR(ERROR_ISO_EXTRACT);
 	}
 
diff --git a/src/rufus.rc b/src/rufus.rc
index b4bf3acd..57865bd8 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 2.15.1118"
+CAPTION "Rufus 2.15.1119"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -334,8 +334,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,15,1118,0
- PRODUCTVERSION 2,15,1118,0
+ FILEVERSION 2,15,1119,0
+ PRODUCTVERSION 2,15,1119,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -352,13 +352,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.15.1118"
+            VALUE "FileVersion", "2.15.1119"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.15.1118"
+            VALUE "ProductVersion", "2.15.1119"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/vhd.c b/src/vhd.c
index 9ad47f20..c1972989 100644
--- a/src/vhd.c
+++ b/src/vhd.c
@@ -614,8 +614,12 @@ DWORD WINAPI WimProgressCallback(DWORD dwMsgId, WPARAM wParam, LPARAM lParam, PV
 	case WIM_MSG_FILEINFO:
 		str = wchar_to_utf8((PWSTR)wParam);
 		pFileData = (PWIN32_FIND_DATA)lParam;
-		size = (((uint64_t)pFileData->nFileSizeHigh) << 32) + pFileData->nFileSizeLow;
-		uprintf("'%s' (%s)", str, SizeToHumanReadable(size, FALSE, FALSE));
+		if (pFileData->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+			uprintf("Creating: %s", str);
+		} else {
+			size = (((uint64_t)pFileData->nFileSizeHigh) << 32) + pFileData->nFileSizeLow;
+			uprintf("Extracting: %s (%s)", str, SizeToHumanReadable(size, FALSE, FALSE));
+		}
 		break;
 	case WIM_MSG_RETRY:
 		level = "retry";
@@ -700,7 +704,7 @@ static DWORD WINAPI WimApplyImageThread(LPVOID param)
 	}
 	count_files = FALSE;
 	// Actual apply
-	if (!pfWIMApplyImage(hImage, wdst, 0)) {
+	if (!pfWIMApplyImage(hImage, wdst, WIM_FLAG_FILEINFO)) {
 		uprintf("  Could not apply image: %s", WindowsErrorString());
 		goto out;
 	}