diff --git a/modules/juce_dsp/widgets/juce_WaveShaper.h b/modules/juce_dsp/widgets/juce_WaveShaper.h
index 32782c7df2..8fde79318f 100644
--- a/modules/juce_dsp/widgets/juce_WaveShaper.h
+++ b/modules/juce_dsp/widgets/juce_WaveShaper.h
@@ -66,7 +66,7 @@ struct WaveShaper
 //==============================================================================
 // Although clang supports C++17, their standard library still has no invoke_result
 // support. Remove the "|| JUCE_CLANG" once clang supports this properly!
-#if (! JUCE_CXX17_IS_AVAILABLE) || JUCE_CLANG
+#if (! JUCE_CXX17_IS_AVAILABLE) || (JUCE_CLANG && ! JUCE_WINDOWS)
 template <typename Functor>
 static WaveShaper<typename std::result_of<Functor>, Functor> CreateWaveShaper (Functor functionToUse)   { return {functionToUse}; }
 #else
diff --git a/modules/juce_graphics/geometry/juce_PathIterator.cpp b/modules/juce_graphics/geometry/juce_PathIterator.cpp
index ec3cd6eac4..785d00fa06 100644
--- a/modules/juce_graphics/geometry/juce_PathIterator.cpp
+++ b/modules/juce_graphics/geometry/juce_PathIterator.cpp
@@ -64,7 +64,7 @@ bool PathFlatteningIterator::next()
     {
         float type;
 
-        if (stackPos == stackBase)
+        if (stackPos == stackBase.get())
         {
             if (source == path.data.end())
                 return false;
@@ -129,7 +129,7 @@ bool PathFlatteningIterator::next()
         {
             ++subPathIndex;
 
-            closesSubPath = stackPos == stackBase
+            closesSubPath = stackPos == stackBase.get()
                              && source != path.data.end()
                              && *source == Path::closeSubPathMarker
                              && x2 == subPathCloseX