diff --git a/msi.c b/msi.c
index f71d22f..d84f917 100644
--- a/msi.c
+++ b/msi.c
@@ -1952,7 +1952,7 @@ static void dirtree_save(MSI_DIRENT *dirent, BIO *outdata, MSI_OUT *out)
 static int fat_save(BIO *outdata, MSI_OUT *out)
 {
     char buf[MAX_SECTOR_SIZE];
-    uint32_t i, j, remain, difatSectors, difatEntriesPerSector, fatSectorIndex, lastFatSectorIndex;
+    uint32_t i, j, remain, difatSectors, difatEntriesPerSector = 0, fatSectorIndex, lastFatSectorIndex;
 
     remain = (out->fatLen + out->sectorSize - 1) / out->sectorSize;
     out->fatSectorsCount = (out->fatLen + remain * 4 + out->sectorSize - 1) / out->sectorSize;
diff --git a/pe.c b/pe.c
index 80daac1..932d00a 100644
--- a/pe.c
+++ b/pe.c
@@ -919,7 +919,7 @@ static u_char *pe_page_hash_calc(int *rphlen, FILE_FORMAT_CTX *ctx, int phtype)
     /* NumberOfSections indicates the size of the section table,
      * which immediately follows the headers, can be up to 65535 under Vista and later */
     nsections = GET_UINT16_LE(ctx->options->indata + ctx->pe_ctx->header_size + 6);
-    if (nsections == 0 || nsections > UINT16_MAX) {
+    if (nsections == 0) {
         printf("Corrupted number of sections: 0x%08X\n", nsections);
         return NULL; /* FAILED */
     }