diff --git a/build/win32/platform_specific_code/juce_win32_Fonts.cpp b/build/win32/platform_specific_code/juce_win32_Fonts.cpp
index 49e1637fd6..ecc286a7b0 100644
--- a/build/win32/platform_specific_code/juce_win32_Fonts.cpp
+++ b/build/win32/platform_specific_code/juce_win32_Fonts.cpp
@@ -486,7 +486,7 @@ static bool addGlyphToTypeface (HDC dc,
         WORD index = 0;
 
         if (wGetGlyphIndicesW (dc, charToTest, 1, &index, GGI_MARK_NONEXISTING_GLYPHS) != GDI_ERROR 
-             && index < 0)
+             && index == 0xffff)
         {
             return false;
         }
@@ -512,7 +512,7 @@ static bool addGlyphToTypeface (HDC dc,
         WORD index = 0;
 
         if (GetGlyphIndicesW (dc, charToTest, 1, &index, GGI_MARK_NONEXISTING_GLYPHS) != GDI_ERROR 
-             && index < 0)
+             && index == 0xffff)
         {
             return false;
         }
diff --git a/build/win32/platform_specific_code/juce_win32_Windowing.cpp b/build/win32/platform_specific_code/juce_win32_Windowing.cpp
index fb18683782..601aa04ed3 100644
--- a/build/win32/platform_specific_code/juce_win32_Windowing.cpp
+++ b/build/win32/platform_specific_code/juce_win32_Windowing.cpp
@@ -606,7 +606,7 @@ public:
                       x - windowBorder.getLeft(),
                       y - windowBorder.getTop(),
                       0, 0,
-                      SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING);
+                      SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER);
     }
 
     void repaintNowIfTransparent()
@@ -634,7 +634,7 @@ public:
         SetWindowPos (hwnd, 0, 0, 0,
                       w + windowBorder.getLeftAndRight(),
                       h + windowBorder.getTopAndBottom(),
-                      SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING);
+                      SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOOWNERZORDER);
 
         updateBorderSize();
 
@@ -651,7 +651,7 @@ public:
                       y - windowBorder.getTop(),
                       w + windowBorder.getLeftAndRight(),
                       h + windowBorder.getTopAndBottom(),
-                      SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING);
+                      SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOOWNERZORDER);
 
         updateBorderSize();
 
@@ -3399,7 +3399,7 @@ public:
     {
         SetWindowPos ((HWND) nativeWindow->getNativeHandle(), 0,
                       x, y, w, h,
-                      SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING);
+                      SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOOWNERZORDER);
     }
 
     void repaint()
diff --git a/src/juce_core/threads/juce_Thread.cpp b/src/juce_core/threads/juce_Thread.cpp
index bf2d500aed..f4234ecd0a 100644
--- a/src/juce_core/threads/juce_Thread.cpp
+++ b/src/juce_core/threads/juce_Thread.cpp
@@ -174,6 +174,10 @@ bool Thread::waitForThreadToExit (const int timeOutMilliseconds) const throw()
 
 void Thread::stopThread (const int timeOutMilliseconds) throw()
 {
+    // agh! You can't stop the thread that's calling this method! How on earth
+    // would that work??
+    jassert (getCurrentThreadId() != getThreadId());
+
     const ScopedLock sl (startStopLock);
 
     if (isThreadRunning())