diff --git a/examples/DemoRunner/Source/Demos/DemoPIPs1.cpp b/examples/DemoRunner/Source/Demos/DemoPIPs1.cpp
index 844cd83eb9..c79f07bfca 100644
--- a/examples/DemoRunner/Source/Demos/DemoPIPs1.cpp
+++ b/examples/DemoRunner/Source/Demos/DemoPIPs1.cpp
@@ -105,7 +105,7 @@ void registerDemos_One() noexcept
     REGISTER_DEMO (OscillatorDemo,            DSP,       false)
     REGISTER_DEMO (OverdriveDemo,             DSP,       false)
     #if JUCE_USE_SIMD
-     REGISTER_DEMO (SIMDRegisterDemo,          DSP,       false)
+     REGISTER_DEMO (SIMDRegisterDemo,         DSP,       false)
     #endif
     REGISTER_DEMO (StateVariableFilterDemo,   DSP,       false)
     REGISTER_DEMO (WaveShaperTanhDemo,        DSP,       false)
diff --git a/examples/DemoRunner/Source/UI/DemoContentComponent.cpp b/examples/DemoRunner/Source/UI/DemoContentComponent.cpp
index fe21fe5e39..ea69439aaa 100644
--- a/examples/DemoRunner/Source/UI/DemoContentComponent.cpp
+++ b/examples/DemoRunner/Source/UI/DemoContentComponent.cpp
@@ -111,7 +111,7 @@ DemoContentComponent::DemoContentComponent (Component& mainComponent, std::funct
     addTab ("Code",     Colours::transparentBlack, codeContent = new CodeContent(), false);
    #endif
 
-    addTab ("Settings", Colours::transparentBlack, new SettingsContent (dynamic_cast<MainComponent&> (mainComponent)),           true);
+    addTab ("Settings", Colours::transparentBlack, new SettingsContent (dynamic_cast<MainComponent&> (mainComponent)), true);
 
     setTabBarDepth (40);
     lookAndFeelChanged();
diff --git a/examples/DemoRunner/Source/UI/MainComponent.cpp b/examples/DemoRunner/Source/UI/MainComponent.cpp
index c0f6162959..f948d19858 100644
--- a/examples/DemoRunner/Source/UI/MainComponent.cpp
+++ b/examples/DemoRunner/Source/UI/MainComponent.cpp
@@ -249,6 +249,15 @@ MainComponent::MainComponent()
         demosPanel.showOrHide (false);
        #endif
 
+        if (isHeavyweight)
+        {
+           #if JUCE_MAC && USE_COREGRAPHICS_RENDERING
+            setRenderingEngine (1);
+           #else
+            setRenderingEngine (0);
+           #endif
+        }
+
         isShowingHeavyweightDemo = isHeavyweight;
         resized();
     });
@@ -393,13 +402,18 @@ void MainComponent::updateRenderingEngine (int renderingEngineIndex)
 {
     if (renderingEngineIndex == (renderingEngines.size() - 1))
     {
+        if (isShowingHeavyweightDemo)
+            return;
+
         openGLContext.attachTo (*getTopLevelComponent());
     }
     else
     {
         openGLContext.detach();
-        peer->setCurrentRenderingEngine (renderingEngineIndex);
     }
 
+    if (peer != nullptr)
+        peer->setCurrentRenderingEngine (renderingEngineIndex);
+
     currentRenderingEngineIdx = renderingEngineIndex;
 }
diff --git a/examples/DemoRunner/Source/UI/MainComponent.h b/examples/DemoRunner/Source/UI/MainComponent.h
index c5ddf97bd1..6a9d1576ab 100644
--- a/examples/DemoRunner/Source/UI/MainComponent.h
+++ b/examples/DemoRunner/Source/UI/MainComponent.h
@@ -30,10 +30,6 @@
 #include "DemoContentComponent.h"
 
 //==============================================================================
-/*
-    This component lives inside our window, and this is where you should put all
-    your controls and content.
-*/
 class MainComponent    : public Component
 {
 public: