diff --git a/src/badblocks.c b/src/badblocks.c
index 5ff11b75..cf2cc1d0 100644
--- a/src/badblocks.c
+++ b/src/badblocks.c
@@ -427,13 +427,12 @@ static unsigned int test_rw(HANDLE hDrive, blk64_t last_block, size_t block_size
 	}
 
 	buffer = allocate_buffer(2 * blocks_at_once * block_size);
-	read_buffer = buffer + blocks_at_once * block_size;
-
 	if (!buffer) {
 		uprintf("%sError while allocating buffers\n", bb_prefix);
 		cancel_ops = -1;
 		return 0;
 	}
+	read_buffer = buffer + blocks_at_once * block_size;
 
 	uprintf("%sChecking from block %lu to %lu (1 block = %s)\n", bb_prefix,
 		(unsigned long) first_block, (unsigned long) last_block - 1,
diff --git a/src/format.c b/src/format.c
index b2135a12..269fc981 100644
--- a/src/format.c
+++ b/src/format.c
@@ -1391,9 +1391,6 @@ static BOOL SetupWinToGo(DWORD DriveIndex, const char* drive_name, BOOL use_esp)
 			return FALSE;
 		}
 		Sleep(200);
-	}
-
-	if (use_esp) {
 		// Need to have the ESP mounted to invoke bcdboot
 		ms_efi = AltMountVolume(DriveIndex, partition_offset[PI_ESP], FALSE);
 		if (ms_efi == NULL) {
diff --git a/src/format_ext.c b/src/format_ext.c
index c7984a99..364da35a 100644
--- a/src/format_ext.c
+++ b/src/format_ext.c
@@ -280,10 +280,8 @@ BOOL FormatExtFs(DWORD DriveIndex, uint64_t PartitionOffset, DWORD BlockSize, LP
 			uprintf("ext4 file system is not supported, defaulting to ext3");
 		else
 			uprintf("Invalid ext file system version requested, defaulting to ext3");
-	}
-
-	if ((strcmp(FSName, FileSystemLabel[FS_EXT2]) != 0) && (strcmp(FSName, FileSystemLabel[FS_EXT3]) != 0))
 		FSName = FileSystemLabel[FS_EXT3];
+	}
 
 	PrintInfoDebug(0, MSG_222, FSName);
 	UpdateProgressWithInfoInit(NULL, TRUE);
diff --git a/src/process.c b/src/process.c
index 00b43565..0cc3ed97 100644
--- a/src/process.c
+++ b/src/process.c
@@ -753,7 +753,7 @@ BOOL EnablePrivileges(void)
 
 	if (NT_SUCCESS(status)) {
 		CHAR privilegesBuffer[FIELD_OFFSET(TOKEN_PRIVILEGES, Privileges) +
-			sizeof(LUID_AND_ATTRIBUTES) * ARRAYSIZE(requestedPrivileges)];
+			sizeof(LUID_AND_ATTRIBUTES) * ARRAYSIZE(requestedPrivileges)] = { 0 };
 		PTOKEN_PRIVILEGES privileges;
 		ULONG i;
 
diff --git a/src/rufus.rc b/src/rufus.rc
index 88a815d7..6289c53d 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 3.10.1652"
+CAPTION "Rufus 3.10.1653"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -395,8 +395,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,10,1652,0
- PRODUCTVERSION 3,10,1652,0
+ FILEVERSION 3,10,1653,0
+ PRODUCTVERSION 3,10,1653,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -414,13 +414,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.10.1652"
+            VALUE "FileVersion", "3.10.1653"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.10.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.10.1652"
+            VALUE "ProductVersion", "3.10.1653"
         END
     END
     BLOCK "VarFileInfo"