diff --git a/MSVC/config.h b/MSVC/config.h
index 7b7f9b4a922c73d9e7e05317b330c9f8e09ce676..70f6085abfbd71789e66e39daccb492b1bf4e57a 100644
--- a/MSVC/config.h
+++ b/MSVC/config.h
@@ -62,7 +62,7 @@ systems. This function is required for `alloca.c' support on those systems.
 #define HAVE_LIBINTL_H 0
 
 /* Define if you have libupnp */
-#define HAVE_LIBUPNP 1
+#define HAVE_LIBUPNP 0
 
 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
diff --git a/MSVC/ring-daemon.vcxproj b/MSVC/ring-daemon.vcxproj
index 32740da4a59d039025b152beb39589fe98d7c0fe..19635e1b9babd61e37c3e4402951cdf5a6e26fc1 100644
--- a/MSVC/ring-daemon.vcxproj
+++ b/MSVC/ring-daemon.vcxproj
@@ -442,7 +442,7 @@
       </Command>
     </PreBuildEvent>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;kernel32.lib;advapi32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;libsamplerate.lib;libsndfile.lib;libgnutls.lib;lib_json.lib;opendht.lib;argon.lib;blake.lib;pcre.lib;pjlib.lib;pjlib_util.lib;pjmedia.lib;pjmedia_codec.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;yaml-cpp.lib;libupnp.lib;pthreadVC2.lib;portaudio.lib;libspeex-pj.lib;cryptlib.lib;libboost_random-vc140-mt-1_61.lib;libboost_random-vc140-mt-gd-1_61.lib;libboost_system-vc140-mt-1_61.lib;libboost_system-vc140-mt-gd-1_61.lib;libboost_thread-vc140-mt-1_61.lib;libboost_thread-vc140-mt-gd-1_61.lib;libboost_date_time-vc140-mt-1_61.lib;libboost_date_time-vc140-mt-gd-1_61.lib;libboost_chrono-vc140-mt-1_61.lib;libboost_chrono-vc140-mt-gd-1_61.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;kernel32.lib;advapi32.lib;avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;libsamplerate.lib;libsndfile.lib;libgnutls.lib;lib_json.lib;opendht.lib;argon.lib;blake.lib;pcre.lib;pjlib.lib;pjlib_util.lib;pjmedia.lib;pjmedia_codec.lib;pjnath.lib;pjsip_core.lib;pjsip_simple.lib;pjsip_ua.lib;pjsua2_lib.lib;pjsua_lib.lib;yaml-cpp.lib;PA_UWP_TEST.lib;libspeex-pj.lib;cryptlib.lib;libboost_random-vc140-mt-1_61.lib;libboost_random-vc140-mt-gd-1_61.lib;libboost_system-vc140-mt-1_61.lib;libboost_system-vc140-mt-gd-1_61.lib;libboost_thread-vc140-mt-1_61.lib;libboost_thread-vc140-mt-gd-1_61.lib;libboost_date_time-vc140-mt-1_61.lib;libboost_date_time-vc140-mt-gd-1_61.lib;libboost_chrono-vc140-mt-1_61.lib;libboost_chrono-vc140-mt-gd-1_61.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\FFmpegInterop\ffmpeg\Build\Windows10\x64\bin;..\contrib\lib\x64;..\contrib\boost\stage\lib</AdditionalLibraryDirectories>
       <AdditionalOptions>/ignore:4006 /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
       <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
diff --git a/src/media/audio/portaudio/portaudiolayer.cpp b/src/media/audio/portaudio/portaudiolayer.cpp
index 3d9ff0e48c4db39668b46e434a5cf87f9e904156..98190f8b3496a34d18617bb7b4806ce3cecfeddc 100644
--- a/src/media/audio/portaudio/portaudiolayer.cpp
+++ b/src/media/audio/portaudio/portaudiolayer.cpp
@@ -354,7 +354,7 @@ PortAudioLayer::init()
 
 #ifdef WIN32_NATIVE
     indexRing_ = indexOut_ = Pa_GetDefaultOutputDevice();
-    indexIn_ = indexIn_ == Pa_GetDefaultInputDevice();
+    indexIn_ = Pa_GetDefaultInputDevice();
 #else
     indexRing_ = indexOut_ = indexOut_ == paNoDevice ? Pa_GetDefaultOutputDevice() : indexOut_;
     indexIn_ = indexIn_ == paNoDevice ? Pa_GetDefaultInputDevice() : indexIn_;