diff --git a/src/libretro/Makefile b/src/libretro/Makefile
index a15ae82af..1a510aa90 100644
--- a/src/libretro/Makefile
+++ b/src/libretro/Makefile
@@ -395,10 +395,9 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
    PATH := $(shell IFS=$$'\n'; cygpath "$(VCCompilerToolsBinDir)/$(TargetArchMoniker)"):$(PATH)
    PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VsInstallRoot)/Common7/IDE")
    INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/include")
+   LIB := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/lib/$(TargetArchMoniker)")
    ifneq (,$(findstring uwp,$(PlatformSuffix)))
-      LIB := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/lib/$(TargetArchMoniker/store)")
-   else
-      LIB := $(shell IFS=$$'\n'; cygpath -w "$(VcCompilerToolsDir)/lib/$(TargetArchMoniker)")
+      LIB := $(shell IFS=$$'\n'; cygpath -w "$(LIB)/store")
    endif
 
    export INCLUDE := $(INCLUDE);$(WindowsSDKSharedIncludeDir);$(WindowsSDKUCRTIncludeDir);$(WindowsSDKUMIncludeDir)
diff --git a/src/libretro/Stella.vcxproj b/src/libretro/Stella.vcxproj
index 5e1b47a2a..ec71d2879 100644
--- a/src/libretro/Stella.vcxproj
+++ b/src/libretro/Stella.vcxproj
@@ -157,7 +157,6 @@
     <ClCompile Include="..\common\RewindManager.cxx" />
     <ClCompile Include="..\common\StaggeredLogger.cxx" />
     <ClCompile Include="..\common\StateManager.cxx" />
-    <ClCompile Include="..\common\ThreadDebugging.cxx" />
     <ClCompile Include="..\common\TimerManager.cxx" />
     <ClCompile Include="..\common\repository\KeyValueRepositoryConfigfile.cxx" />
     <ClCompile Include="..\common\tv_filters\AtariNTSC.cxx" />
@@ -281,7 +280,6 @@
     <ClInclude Include="..\common\StateManager.hxx" />
     <ClInclude Include="..\common\StellaKeys.hxx" />
     <ClInclude Include="..\common\StringParser.hxx" />
-    <ClInclude Include="..\common\ThreadDebugging.hxx" />
     <ClInclude Include="..\common\TimerManager.hxx" />
     <ClInclude Include="..\common\tv_filters\AtariNTSC.hxx" />
     <ClInclude Include="..\common\tv_filters\NTSCFilter.hxx" />
@@ -414,4 +412,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/libretro/StellaLIBRETRO.cxx b/src/libretro/StellaLIBRETRO.cxx
index 105dcb251..ac6ea49ac 100644
--- a/src/libretro/StellaLIBRETRO.cxx
+++ b/src/libretro/StellaLIBRETRO.cxx
@@ -284,7 +284,7 @@ float StellaLIBRETRO::getVideoAspectPar()
 	else
 	  par = video_aspect_pal / 100.0;
   }
-  
+
   return par;
 }