diff --git a/Texassemble/texassemble.cpp b/Texassemble/texassemble.cpp
index 75ce6ee..29f3d65 100644
--- a/Texassemble/texassemble.cpp
+++ b/Texassemble/texassemble.cpp
@@ -820,7 +820,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
             {
                 wcscpy_s(szOutputFile, MAX_PATH, pValue);
 
-                wchar_t ext[_MAX_EXT];
+                wchar_t ext[_MAX_EXT] = {};
                 _wsplitpath_s(szOutputFile, nullptr, 0, nullptr, 0, nullptr, 0, ext, _MAX_EXT);
 
                 fileType = LookupByName(ext, g_pExtFileTypes);
@@ -995,8 +995,8 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
 
     if (dwCommand == CMD_GIF)
     {
-        wchar_t ext[_MAX_EXT];
-        wchar_t fname[_MAX_FNAME];
+        wchar_t ext[_MAX_EXT] = {};
+        wchar_t fname[_MAX_FNAME] = {};
         _wsplitpath_s(conversion.front().szSrc, nullptr, 0, nullptr, 0, fname, _MAX_FNAME, ext, _MAX_EXT);
 
         wprintf(L"reading %ls", conversion.front().szSrc);
@@ -1018,8 +1018,8 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
     {
         for (auto pConv = conversion.begin(); pConv != conversion.end(); ++pConv)
         {
-            wchar_t ext[_MAX_EXT];
-            wchar_t fname[_MAX_FNAME];
+            wchar_t ext[_MAX_EXT] = {};
+            wchar_t fname[_MAX_FNAME] = {};
             _wsplitpath_s(pConv->szSrc, nullptr, 0, nullptr, 0, fname, _MAX_FNAME, ext, _MAX_EXT);
 
             // Load source image
@@ -1172,7 +1172,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
                     static_assert(static_cast<int>(WIC_FLAGS_FILTER_CUBIC) == static_cast<int>(TEX_FILTER_CUBIC), "WIC_FLAGS_* & TEX_FILTER_* should match");
                     static_assert(static_cast<int>(WIC_FLAGS_FILTER_FANT) == static_cast<int>(TEX_FILTER_FANT), "WIC_FLAGS_* & TEX_FILTER_* should match");
 
-                    hr = LoadFromWICFile(pConv->szSrc, dwFilter | WIC_FLAGS_ALL_FRAMES, &info, *image);
+                    hr = LoadFromWICFile(pConv->szSrc, WIC_FLAGS_ALL_FRAMES | dwFilter, &info, *image);
                     if (FAILED(hr))
                     {
                         wprintf(L" FAILED (%x)\n", static_cast<unsigned int>(hr));
diff --git a/Texconv/texconv.cpp b/Texconv/texconv.cpp
index 3a41b2a..25a0817 100644
--- a/Texconv/texconv.cpp
+++ b/Texconv/texconv.cpp
@@ -1657,8 +1657,8 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
         wprintf(L"reading %ls", pConv->szSrc);
         fflush(stdout);
 
-        wchar_t ext[_MAX_EXT];
-        wchar_t fname[_MAX_FNAME];
+        wchar_t ext[_MAX_EXT] = {};
+        wchar_t fname[_MAX_FNAME] = {};
         _wsplitpath_s(pConv->szSrc, nullptr, 0, nullptr, 0, fname, _MAX_FNAME, ext, _MAX_EXT);
 
         TexMetadata info;
diff --git a/Texdiag/texdiag.cpp b/Texdiag/texdiag.cpp
index ec9273f..5fd4c84 100644
--- a/Texdiag/texdiag.cpp
+++ b/Texdiag/texdiag.cpp
@@ -587,7 +587,7 @@ namespace
         if (!image)
             return E_OUTOFMEMORY;
 
-        wchar_t ext[_MAX_EXT];
+        wchar_t ext[_MAX_EXT] = {};
         _wsplitpath_s(fileName, nullptr, 0, nullptr, 0, nullptr, 0, ext, _MAX_EXT);
 
         if (_wcsicmp(ext, L".dds") == 0)
@@ -3180,7 +3180,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
                 {
                     wcscpy_s(szOutputFile, MAX_PATH, pValue);
 
-                    wchar_t ext[_MAX_EXT];
+                    wchar_t ext[_MAX_EXT] = {};
                     _wsplitpath_s(szOutputFile, nullptr, 0, nullptr, 0, nullptr, 0, ext, _MAX_EXT);
 
                     fileType = LookupByName(ext, g_pExtFileTypes);
@@ -3361,8 +3361,8 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
             {
                 if (!*szOutputFile)
                 {
-                    wchar_t ext[_MAX_EXT];
-                    wchar_t fname[_MAX_FNAME];
+                    wchar_t ext[_MAX_EXT] = {};
+                    wchar_t fname[_MAX_FNAME] = {};
                     _wsplitpath_s(pImage1->szSrc, nullptr, 0, nullptr, 0, fname, _MAX_FNAME, ext, _MAX_EXT);
                     if (_wcsicmp(ext, L".bmp") == 0)
                     {
@@ -3656,8 +3656,8 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
                     return 1;
                 }
 
-                wchar_t ext[_MAX_EXT];
-                wchar_t fname[_MAX_FNAME];
+                wchar_t ext[_MAX_EXT] = {};
+                wchar_t fname[_MAX_FNAME] = {};
                 _wsplitpath_s(pConv->szSrc, nullptr, 0, nullptr, 0, fname, _MAX_FNAME, nullptr, 0);
 
                 wcscpy_s(ext, LookupByValue(fileType, g_pDumpFileTypes));
@@ -3680,7 +3680,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
                             }
                             else
                             {
-                                wchar_t subFname[_MAX_FNAME];
+                                wchar_t subFname[_MAX_FNAME] = {};
                                 if (info.mipLevels > 1)
                                 {
                                     swprintf_s(subFname, L"%ls_slice%03zu_mip%03zu", fname, slice, mip);