diff --git a/extras/audio plugins/wrapper/formats/VST/juce_VstWrapper.cpp b/extras/audio plugins/wrapper/formats/VST/juce_VstWrapper.cpp
index 90d159115a..4109d09765 100644
--- a/extras/audio plugins/wrapper/formats/VST/juce_VstWrapper.cpp	
+++ b/extras/audio plugins/wrapper/formats/VST/juce_VstWrapper.cpp	
@@ -1238,13 +1238,18 @@ static AEffect* pluginEntryPoint (audioMasterCallback audioMaster)
     return 0;
 }
 
+
 //==============================================================================
 // Mac startup code..
 #if JUCE_MAC
 
-extern "C" __attribute__((visibility("default"))) AEffect* main_macho (audioMasterCallback audioMaster)
+extern "C" __attribute__ ((visibility("default"))) AEffect* VSTPluginMain (audioMasterCallback audioMaster)
+{
+    return pluginEntryPoint (audioMaster);
+}
+
+extern "C" __attribute__ ((visibility("default"))) AEffect* main_macho (audioMasterCallback audioMaster)
 {
-    initialiseJuce_GUI();
     return pluginEntryPoint (audioMaster);
 }
 
@@ -1257,8 +1262,7 @@ extern "C" AEffect* main_plugin (audioMasterCallback audioMaster) asm ("main");
 extern "C" AEffect* main_plugin (audioMasterCallback audioMaster)
 {
     initialiseJuce_GUI();
-
-    SharedMessageThread::getInstance ();
+    SharedMessageThread::getInstance();
 
     return pluginEntryPoint (audioMaster);
 }
@@ -1277,7 +1281,12 @@ __attribute__((destructor)) void myPluginFini()
 // Win32 startup code..
 #else
 
-__declspec(dllexport) void* main (audioMasterCallback audioMaster)
+extern "C" __declspec (dllexport) AEffect* VSTPluginMain (audioMasterCallback audioMaster)
+{
+    return pluginEntryPoint (audioMaster);
+}
+
+extern "C" __declspec (dllexport) void* main (audioMasterCallback audioMaster)
 {
     return (void*) pluginEntryPoint (audioMaster);
 }
diff --git a/extras/juce demo/src/MainDemoWindow.cpp b/extras/juce demo/src/MainDemoWindow.cpp
index 6ec0d0579b..a48e5d0619 100644
--- a/extras/juce demo/src/MainDemoWindow.cpp	
+++ b/extras/juce demo/src/MainDemoWindow.cpp	
@@ -55,8 +55,6 @@ public:
         textBox->setMultiLine (true, false);
         textBox->setReturnKeyStartsNewLine (true);
 
-        setAlwaysOnTop (true);
-
         setResizable (true, true); // we'll choose a corner-resizer component for this window,
                                    // as a contrast to the resizable border on the main window
     }