diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 909497db4e0..06bb192cb29 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -7,6 +7,7 @@ trigger:
 
 pr:
 - master
+- surge++-master
 
 jobs:
 - job: Build
diff --git a/src/common/SurgeStorage.cpp b/src/common/SurgeStorage.cpp
index c895df89ee2..a482dccf79a 100644
--- a/src/common/SurgeStorage.cpp
+++ b/src/common/SurgeStorage.cpp
@@ -300,25 +300,28 @@ SurgeStorage::SurgeStorage(std::string suppliedDataPath)
    getPatch().scene[0].osc[0].wt.dt = 1.0f / 512.f;
    load_wt(0, &getPatch().scene[0].osc[0].wt);
 
-   // WindowWT is a WaveTable which now has a constructor so don't do this
-   // memset(&WindowWT, 0, sizeof(WindowWT));
-   if( ! load_wt_wt(datapath + "windows.wt", &WindowWT) )
+   if( loadWtAndPatch )
    {
-      std::ostringstream oss;
-      oss << "Unable to load '" << datapath << "/windows.wt'. This file is required for surge to operate "
-          << "properly. This occurs when Surge is mis-installed and shared resources are not in the "
-          << "os-specific shared directory, which on your OS is a directory called 'Surge' in "
+      // WindowWT is a WaveTable which now has a constructor so don't do this
+      // memset(&WindowWT, 0, sizeof(WindowWT));
+      if( ! load_wt_wt(datapath + "windows.wt", &WindowWT) )
+      {
+         std::ostringstream oss;
+         oss << "Unable to load '" << datapath << "/windows.wt'. This file is required for surge to operate "
+             << "properly. This occurs when Surge is mis-installed and shared resources are not in the "
+             << "os-specific shared directory, which on your OS is a directory called 'Surge' in "
 #if MAC
-          << "the global or user local `Library/Application Support` directory."
+             << "the global or user local `Library/Application Support` directory."
 #endif
 #if WINDOWS
-          << "your %LocalAppData% directory."
+             << "your %LocalAppData% directory."
 #endif
 #if LINUX
-          << "/usr/share or ~/.local/share."
+             << "/usr/share or ~/.local/share."
 #endif
-          << " Please install shared assets correctly and restart.";
-      Surge::UserInteractions::promptError(oss.str(), "Unable to load windows.wt");
+             << " Please install shared assets correctly and restart.";
+         Surge::UserInteractions::promptError(oss.str(), "Unable to load windows.wt");
+      }
    }
 }
 
diff --git a/src/common/gui/CScalableBitmap.h b/src/common/gui/CScalableBitmap.h
index dd7521bb9c7..650f825c17b 100644
--- a/src/common/gui/CScalableBitmap.h
+++ b/src/common/gui/CScalableBitmap.h
@@ -56,7 +56,7 @@ class CScalableBitmap : public VSTGUI::CBitmap
    /*
    ** In "glyph" mode I remap colors. This doesn't really change except at construction time.
    */
-   bool setGlyphMode( bool b ) {
+   void setGlyphMode( bool b ) {
       glyphMode = b;
    }
    
diff --git a/src/lv2/SurgeLv2Wrapper.cpp b/src/lv2/SurgeLv2Wrapper.cpp
index 16b03fe8962..f665b5d2da4 100644
--- a/src/lv2/SurgeLv2Wrapper.cpp
+++ b/src/lv2/SurgeLv2Wrapper.cpp
@@ -13,7 +13,11 @@ SurgeLv2Wrapper::SurgeLv2Wrapper(double sampleRate)
 }
 
 SurgeLv2Wrapper::~SurgeLv2Wrapper()
-{}
+{
+   // FIXME S++ has an error whereby you crash on delete on linux.
+   // So for now just leak the synth
+   auto LEAKTHIS = _synthesizer.release();
+}
 
 void SurgeLv2Wrapper::updateDisplay()
 {