diff --git a/ChangeLog.txt b/ChangeLog.txt
index a1b2c764..2ec3a52a 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,10 +1,10 @@
-o Version 2.3 (2015.08.??)
+o Version 2.3 (2015.08.28)
     Detect ISOHybrid images and prompt users on how they should be written
     Add MD5/SHA1 checksum verification ('#' button on the status bar)
     Add Zip decompression support for DD Images
     Add a cheat mode to save the current USB to VHD (Alt-V)
     Add a cheat mode for ISO timestamp preservation (Alt-T)
-    Add a cheat more for USB enumeration debugging (Alt-.)
+    Add a cheat mode for USB enumeration debugging (Alt-.)
     Disable MS-DOS creation for Windows 10 or later (FreeDOS is still available)
     Fix Windows To Go creation issues, and enable access to internal disks
     Fix UEFI support for Fedora ISOs
diff --git a/src/drive.c b/src/drive.c
index 98cf7ec1..0e807b8e 100644
--- a/src/drive.c
+++ b/src/drive.c
@@ -855,6 +855,8 @@ BOOL MountVolume(char* drive_name, char *drive_guid)
 		uprintf("Volume is already mounted, but as %c: instead of %c: - Unmounting...\n", mounted_letter[0], drive_name[0]);
 		if (!DeleteVolumeMountPointA(mounted_letter))
 			uprintf("Failed to unmount volume: %s", WindowsErrorString());
+		// Also delete the destination mountpoint if needed (Don't care about errors)
+		DeleteVolumeMountPointA(drive_name);
 		Sleep(200);
 	}
 
diff --git a/src/ms-sys/.msvc/ms-sys.vcxproj b/src/ms-sys/.msvc/ms-sys.vcxproj
index befb7534..83b1b6a7 100644
--- a/src/ms-sys/.msvc/ms-sys.vcxproj
+++ b/src/ms-sys/.msvc/ms-sys.vcxproj
@@ -144,6 +144,7 @@
       <AdditionalIncludeDirectories>../inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalOptions>/analyze:stacksize32850 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -164,6 +165,7 @@
       <AdditionalIncludeDirectories>../inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalOptions>/analyze:stacksize32850 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
       <TargetMachine>MachineX86</TargetMachine>
@@ -179,6 +181,7 @@
       <AdditionalIncludeDirectories>../inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalOptions>/analyze:stacksize32850 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -199,6 +202,7 @@
       <AdditionalIncludeDirectories>../inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalOptions>/analyze:stacksize32850 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/src/rufus.rc b/src/rufus.rc
index 7f4fe9be..daa5f4f4 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -32,7 +32,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
-CAPTION "Rufus 2.3.708"
+CAPTION "Rufus 2.3.709"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -317,8 +317,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,708,0
- PRODUCTVERSION 2,3,708,0
+ FILEVERSION 2,3,709,0
+ PRODUCTVERSION 2,3,709,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -335,13 +335,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.3.708"
+            VALUE "FileVersion", "2.3.709"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.3.708"
+            VALUE "ProductVersion", "2.3.709"
         END
     END
     BLOCK "VarFileInfo"