diff --git a/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp b/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp
index c5bcbbb1a2..63838d2ae1 100644
--- a/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp
+++ b/extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp
@@ -262,7 +262,7 @@ void RolloverHelpComp::paint (Graphics& g)
 {
     AttributedString s;
     s.setJustification (Justification::centredLeft);
-    s.append (lastTip, Font (14.0f), Colour::greyLevel (0.15f));
+    s.append (lastTip, Font (14.0f), findColour (mainBackgroundColourId).contrasting (0.7f));
 
     TextLayout tl;
     tl.createLayoutWithBalancedLineLengths (s, getWidth() - 10.0f);
diff --git a/modules/juce_core/threads/juce_Thread.cpp b/modules/juce_core/threads/juce_Thread.cpp
index ebf5b0a638..2cf56f85b8 100644
--- a/modules/juce_core/threads/juce_Thread.cpp
+++ b/modules/juce_core/threads/juce_Thread.cpp
@@ -156,15 +156,14 @@ bool Thread::waitForThreadToExit (const int timeOutMilliseconds) const
     // Doh! So how exactly do you expect this thread to wait for itself to stop??
     jassert (getThreadId() != getCurrentThreadId() || getCurrentThreadId() == 0);
 
-    const int sleepMsPerIteration = 5;
-    int count = timeOutMilliseconds / sleepMsPerIteration;
+    const uint32 timeoutEnd = Time::getMillisecondCounter() + timeOutMilliseconds;
 
     while (isThreadRunning())
     {
-        if (timeOutMilliseconds >= 0 && --count < 0)
+        if (timeOutMilliseconds >= 0 && Time::getMillisecondCounter() > timeoutEnd)
             return false;
 
-        sleep (sleepMsPerIteration);
+        sleep (2);
     }
 
     return true;