diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
index bd295f72b6..2179179016 100644
--- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
+++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
@@ -2902,8 +2902,8 @@ FileSearchPath VSTPluginFormat::getDefaultLocationsToSearch()
    #elif JUCE_WINDOWS
     const String programFiles (File::getSpecialLocation (File::globalApplicationsDirectory).getFullPathName());
 
-    return FileSearchPath (PlatformUtilities::getRegistryValue ("HKLM\\Software\\VST\\VSTPluginsPath",
-                                                                programFiles + "\\Steinberg\\VstPlugins"));
+    return FileSearchPath (WindowsRegistry::getRegistryValue ("HKLM\\Software\\VST\\VSTPluginsPath",
+                                                              programFiles + "\\Steinberg\\VstPlugins"));
    #elif JUCE_LINUX
     return FileSearchPath ("/usr/lib/vst");
    #endif
diff --git a/modules/juce_core/system/juce_PlatformDefs.h b/modules/juce_core/system/juce_PlatformDefs.h
index 9240dde894..37600dca33 100644
--- a/modules/juce_core/system/juce_PlatformDefs.h
+++ b/modules/juce_core/system/juce_PlatformDefs.h
@@ -66,7 +66,7 @@
       on the platform.
       @see jassert()
   */
-  #define juce_breakDebugger        { Debugger(); }
+  #define juce_breakDebugger        { assert (false); }
 #elif JUCE_IOS || JUCE_LINUX || JUCE_ANDROID
   #define juce_breakDebugger        { kill (0, SIGTRAP); }
 #elif JUCE_USE_INTRINSICS
diff --git a/modules/juce_gui_basics/application/juce_Application.h b/modules/juce_gui_basics/application/juce_Application.h
index 53dcf56cc2..e9ba4641e8 100644
--- a/modules/juce_gui_basics/application/juce_Application.h
+++ b/modules/juce_gui_basics/application/juce_Application.h
@@ -132,7 +132,8 @@ public:
     /** Checks whether multiple instances of the app are allowed.
 
         If you application class returns true for this, more than one instance is
-        permitted to run (except on the Mac where this isn't possible).
+        permitted to run (except on OSX where the OS automatically stops you launching
+        a second instance of an app without explicitly starting it from the command-line).
 
         If it's false, the second instance won't start, but it you will still get a
         callback to anotherInstanceStarted() to tell you about this - which