diff --git a/common/kernel/context.h b/common/kernel/context.h
index bd50e817..473d9b21 100644
--- a/common/kernel/context.h
+++ b/common/kernel/context.h
@@ -39,15 +39,7 @@ struct Context : Arch, DeterministicRNG
     // True when detailed per-net timing is to be stored / reported
     bool detailed_timing_report = false;
 
-    ArchArgs arch_args;
-
-    Context(ArchArgs args) : Arch(args)
-    {
-        BaseCtx::as_ctx = this;
-        arch_args = args;
-    }
-
-    ArchArgs getArchArgs() { return arch_args; }
+    Context(ArchArgs args) : Arch(args) { BaseCtx::as_ctx = this; }
 
     // --------------------------------------------------------------
 
diff --git a/common/kernel/embed.cc b/common/kernel/embed.cc
index d4544bf6..52b7e030 100644
--- a/common/kernel/embed.cc
+++ b/common/kernel/embed.cc
@@ -3,8 +3,8 @@
 #define NOMINMAX
 #include <windows.h>
 #endif
-#include <filesystem>
 #include <boost/iostreams/device/mapped_file.hpp>
+#include <filesystem>
 #include "embed.h"
 #include "nextpnr.h"
 
diff --git a/gui/basewindow.cc b/gui/basewindow.cc
index b42b3c62..f4187a6a 100644
--- a/gui/basewindow.cc
+++ b/gui/basewindow.cc
@@ -368,7 +368,7 @@ void BaseMainWindow::open_json()
     if (!fileName.isEmpty()) {
         disableActions();
         if (ctx->settings.find(ctx->id("synth")) == ctx->settings.end()) {
-            ArchArgs chipArgs = ctx->getArchArgs();
+            ArchArgs chipArgs = ctx->args;
             ctx = std::unique_ptr<Context>(new Context(chipArgs));
             Q_EMIT contextChanged(ctx.get());
         }
diff --git a/gui/himbaechel/mainwindow.cc b/gui/himbaechel/mainwindow.cc
index e9d280eb..0f2a29b2 100644
--- a/gui/himbaechel/mainwindow.cc
+++ b/gui/himbaechel/mainwindow.cc
@@ -20,7 +20,6 @@
 #include "mainwindow.h"
 
 #include <QMessageBox>
-#include <cstdlib>
 
 static void initMainResource() { Q_INIT_RESOURCE(nextpnr); }
 
@@ -46,7 +45,6 @@ void MainWindow::new_proj()
 {
     QMessageBox::critical(0, "Error",
                           "Creating a new project not supported in himbächel mode, please re-start from command line.");
-    std::exit(1);
 }
 
 NEXTPNR_NAMESPACE_END