diff --git a/src/Options.cpp b/src/Options.cpp
index 2c259ea8..1a99feff 100644
--- a/src/Options.cpp
+++ b/src/Options.cpp
@@ -274,14 +274,8 @@ Options::Options(int argc, char** argv) :
 		{
 			break;
 		}
-		if(optarg == NULL)
-		{
-			fprintf(stderr, "Unsupported option argument %d: #%d '%s'\n",
-			        key, argc, argv[argc - 1]);
-			continue;
-		}
 
-		if(!parseArg(key, optarg))
+		if(!parseArg(key, optarg == NULL ? "" : optarg))
 		{
 			return;
 		}
diff --git a/src/crypto/CryptoNight_x86.h b/src/crypto/CryptoNight_x86.h
index 33899a5d..3e93f814 100644
--- a/src/crypto/CryptoNight_x86.h
+++ b/src/crypto/CryptoNight_x86.h
@@ -317,6 +317,7 @@ static inline void cn_implode_scratchpad(const __m128i* input, __m128i* output)
 }
 
 #if ! defined _WIN64  && defined _WIN32
+#if defined(_MSC_VER) && _MSC_VER < 1900
 static inline __m128i _mm_set_epi64x(const uint64_t __a, const uint64_t __b)
 {
 	__m128i ret;
@@ -325,6 +326,7 @@ static inline __m128i _mm_set_epi64x(const uint64_t __a, const uint64_t __b)
 	return ret;
 }
 #endif
+#endif
 
 template<size_t ITERATIONS, size_t MEM, size_t MASK, bool SOFT_AES>
 inline void cryptonight_hash(const void* __restrict__ input, size_t size, void* __restrict__ output,