diff --git a/blake2.cpp b/blake2.cpp
index 7ea6318b..3e655b81 100644
--- a/blake2.cpp
+++ b/blake2.cpp
@@ -25,7 +25,7 @@ NAMESPACE_BEGIN(CryptoPP)
 
 // Sun Studio 12.3 and earlier lack SSE2's _mm_set_epi64x.
 // Also see http://stackoverflow.com/a/38547909/608639
-#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE && ((__SUNPRO_CC >= 0x5100 && __SUNPRO_CC < 0x5130) || (_MSC_VER >= 1200 && _MSC_VER < 1600) || (defined(_M_IX86) && _MSC_VER == 1600))
+#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE && ((__SUNPRO_CC >= 0x5100 && __SUNPRO_CC < 0x5130) || (_MSC_VER >= 1200 && _MSC_VER < 1600) || (defined(_M_IX86) && _MSC_VER >= 1600 && _MSC_VER <= 1700))
 inline __m128i _mm_set_epi64x(const word64 a, const word64 b)
 {
     union INT_128_64x2 {
diff --git a/validat1.cpp b/validat1.cpp
index 3033a0a1..4a798dde 100644
--- a/validat1.cpp
+++ b/validat1.cpp
@@ -832,6 +832,7 @@ bool TestHuffmanCodes()
     }
     catch(const Exception& ex)
     {
+        CRYPTOPP_UNUSED(ex);
         return false;
     }