diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ed9cc8b..6d5b3df 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -107,7 +107,10 @@ jobs:
         env:
           CC: i686-linux-gnu-gcc
           CXX: i686-linux-gnu-g++
-          LDFLAGS: -static-libgcc -static-libstdc++
+          CFLAGS: -m32
+          CXXFLAGS: -m32
+          LDFLAGS: -m32 -static-libgcc -static-libstdc++
+          PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig
         run: |
           make features
           make -j $(nproc)
diff --git a/plugins/Cardinal/CardinalPlugin.cpp b/plugins/Cardinal/CardinalPlugin.cpp
index 1fdf154..4edad08 100644
--- a/plugins/Cardinal/CardinalPlugin.cpp
+++ b/plugins/Cardinal/CardinalPlugin.cpp
@@ -103,7 +103,7 @@ struct Initializer {
             /*
             osdialog_message(OSDIALOG_ERROR, OSDIALOG_OK, message.c_str());
             */
-            exit(1);
+            // exit(1);
         }
 
         INFO("Initializing environment");
@@ -167,14 +167,14 @@ public:
         fContext->event->rootWidget = fContext->scene;
         fContext->patch = new rack::patch::Manager;
         fContext->patch->autosavePath = "/OBVIOUSLY-NOT-VALID-PATH/";
-    	fContext->engine->startFallbackThread();
+        fContext->engine->startFallbackThread();
     }
 
     ~CardinalPlugin() override
     {
         const ScopedContext sc(this);
 
-	    delete fContext;
+        delete fContext;
     }
 
     rack::Context* getRackContext() const noexcept