diff --git a/include/cereal/external/rapidjson/document.h b/include/cereal/external/rapidjson/document.h
index 91c4be80..e1214c94 100644
--- a/include/cereal/external/rapidjson/document.h
+++ b/include/cereal/external/rapidjson/document.h
@@ -1929,17 +1929,17 @@ class GenericValue {
 
         // Initial flags of different types.
         kNullFlag = kNullType,
-        kTrueFlag = kTrueType | kBoolFlag,
-        kFalseFlag = kFalseType | kBoolFlag,
-        kNumberIntFlag = kNumberType | kNumberFlag | kIntFlag | kInt64Flag,
-        kNumberUintFlag = kNumberType | kNumberFlag | kUintFlag | kUint64Flag | kInt64Flag,
-        kNumberInt64Flag = kNumberType | kNumberFlag | kInt64Flag,
-        kNumberUint64Flag = kNumberType | kNumberFlag | kUint64Flag,
-        kNumberDoubleFlag = kNumberType | kNumberFlag | kDoubleFlag,
-        kNumberAnyFlag = kNumberType | kNumberFlag | kIntFlag | kInt64Flag | kUintFlag | kUint64Flag | kDoubleFlag,
-        kConstStringFlag = kStringType | kStringFlag,
-        kCopyStringFlag = kStringType | kStringFlag | kCopyFlag,
-        kShortStringFlag = kStringType | kStringFlag | kCopyFlag | kInlineStrFlag,
+		kTrueFlag = static_cast<int>(kTrueType) | static_cast<int>(kBoolFlag),
+		kFalseFlag = static_cast<int>(kFalseType) | static_cast<int>(kBoolFlag),
+		kNumberIntFlag = static_cast<int>(kNumberType) | static_cast<int>(kNumberFlag | kIntFlag | kInt64Flag),
+		kNumberUintFlag = static_cast<int>(kNumberType) | static_cast<int>(kNumberFlag | kUintFlag | kUint64Flag | kInt64Flag),
+		kNumberInt64Flag = static_cast<int>(kNumberType) | static_cast<int>(kNumberFlag | kInt64Flag),
+		kNumberUint64Flag = static_cast<int>(kNumberType) | static_cast<int>(kNumberFlag | kUint64Flag),
+		kNumberDoubleFlag = static_cast<int>(kNumberType) | static_cast<int>(kNumberFlag | kDoubleFlag),
+		kNumberAnyFlag = static_cast<int>(kNumberType) | static_cast<int>(kNumberFlag | kIntFlag | kInt64Flag | kUintFlag | kUint64Flag | kDoubleFlag),
+		kConstStringFlag = static_cast<int>(kStringType) | static_cast<int>(kStringFlag),
+		kCopyStringFlag = static_cast<int>(kStringType) | static_cast<int>(kStringFlag | kCopyFlag),
+		kShortStringFlag = static_cast<int>(kStringType) | static_cast<int>(kStringFlag | kCopyFlag | kInlineStrFlag),
         kObjectFlag = kObjectType,
         kArrayFlag = kArrayType,
 
diff --git a/include/cereal/external/rapidjson/istreamwrapper.h b/include/cereal/external/rapidjson/istreamwrapper.h
index 4df7ce3e..bf58c9d3 100644
--- a/include/cereal/external/rapidjson/istreamwrapper.h
+++ b/include/cereal/external/rapidjson/istreamwrapper.h
@@ -22,7 +22,7 @@
 #ifdef __clang__
 CEREAL_RAPIDJSON_DIAG_PUSH
 CEREAL_RAPIDJSON_DIAG_OFF(padded)
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) && _MSC_VER < 1910
 CEREAL_RAPIDJSON_DIAG_PUSH
 CEREAL_RAPIDJSON_DIAG_OFF(4351) // new behavior: elements of array 'array' will be default initialized
 #endif
@@ -119,7 +119,7 @@ class BasicIStreamWrapper {
 typedef BasicIStreamWrapper<std::istream> IStreamWrapper;
 typedef BasicIStreamWrapper<std::wistream> WIStreamWrapper;
 
-#if defined(__clang__) || defined(_MSC_VER)
+#if defined(__clang__) || (defined(_MSC_VER) && _MSC_VER < 1910)
 CEREAL_RAPIDJSON_DIAG_POP
 #endif