diff --git a/src/Anura.ts b/src/Anura.ts
index 020df85d..60e3a7cf 100755
--- a/src/Anura.ts
+++ b/src/Anura.ts
@@ -26,6 +26,11 @@ class Anura {
     dialog: Dialog;
     sw: SWProcess;
     anurad: Anurad;
+    systray: Systray;
+    uri = new URIHandlerAPI();
+    files = new FilesAPI();
+    wm = new WMAPI();
+    ContextMenu = ContextMenuAPI;
 
     private constructor(
         fs: AnuraFilesystem,
@@ -76,8 +81,6 @@ class Anura {
         return anuraPartial;
     }
 
-    wm = new WMAPI();
-
     apps: any = {};
     libs: any = {};
     logger = {
@@ -163,7 +166,6 @@ class Anura {
         await anura.registerLib(lib); // This will let us capture error messages
         return lib;
     }
-    ContextMenu = ContextMenuAPI;
     removeStaleApps() {
         for (const appName in anura.apps) {
             const app = anura.apps[appName];
@@ -176,7 +178,6 @@ class Anura {
         taskbar.updateTaskbar();
         alttab.update();
     }
-    systray: Systray;
     async import(packageName: string, searchPath?: string) {
         if (searchPath) {
             // Using node-style module resolution
@@ -219,8 +220,6 @@ class Anura {
         const version = splitName[1] || null;
         return await this.libs[pkg].getImport(version);
     }
-    uri = new URIHandlerAPI();
-    files = new FilesAPI();
     get wsproxyURL() {
         return this.settings.get("wisp-url");
     }
diff --git a/src/oobe/OobeView.tsx b/src/oobe/OobeView.tsx
index 7fcc85f7..bbb02e3e 100644
--- a/src/oobe/OobeView.tsx
+++ b/src/oobe/OobeView.tsx
@@ -320,8 +320,7 @@ class OobeView {
     }
 }
 
-async function installx86() {
-    const tracker = document.getElementById("tracker");
+async function installx86(tracker = document.getElementById("tracker")) {
     console.debug("installing x86");
     const x86image = anura.settings.get("x86-image");
     tracker!.innerText = "Downloading x86 kernel";
@@ -422,6 +421,7 @@ async function installx86() {
 
     console.debug("done");
 }
+
 async function preloadFiles(tracker = document.getElementById("tracker")) {
     try {
         const list = await (await fetch("cache-load.json")).json();
diff --git a/x86_image_wizard/epoxy b/x86_image_wizard/epoxy
index a1963f53..ee0ad89f 160000
--- a/x86_image_wizard/epoxy
+++ b/x86_image_wizard/epoxy
@@ -1 +1 @@
-Subproject commit a1963f53f11327e88c1f64b899ad130bc1fcb51a
+Subproject commit ee0ad89f3e89e3f1c6ef5145f1709dfe4c9eb263