diff --git a/base/file_sys.h b/base/file_sys.h
index e39197537..92f845b37 100644
--- a/base/file_sys.h
+++ b/base/file_sys.h
@@ -4,6 +4,13 @@
 #pragma once
 
 #ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN  // Exclude rarely-used stuff from Windows headers
+#endif
+
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #include <Windows.h>
 #endif  // _WIN32
 
diff --git a/include/ortx_tokenizer.h b/include/ortx_tokenizer.h
index e51a5bd5f..830516888 100644
--- a/include/ortx_tokenizer.h
+++ b/include/ortx_tokenizer.h
@@ -33,10 +33,9 @@ struct OrtxTokenizerBlob {
                     const std::string_view& raw_model_blob = {})
       : config_json_blob(config_json_blob.data()), vocab_json_blob(vocab_json_blob.data()),
         token_module_blob(token_module_blob.data()), raw_model_blob(raw_model_blob.data()),
-        config_blob_len(config_json_blob.size()),
+        reserved_blob_1(nullptr), config_blob_len(config_json_blob.size()),
         vocab_blob_len(vocab_json_blob.size()), token_module_blob_len(token_module_blob.size()),
-        raw_model_blob_len(raw_model_blob.size()), reserved_blob_1(nullptr),
-        reserved_blob_1_len(0) {}
+        raw_model_blob_len(raw_model_blob.size()), reserved_blob_1_len(0) {}
 #endif
 };