diff --git a/janet-installer.nsi b/janet-installer.nsi
index 78787268..77baf6c8 100644
--- a/janet-installer.nsi
+++ b/janet-installer.nsi
@@ -1,3 +1,7 @@
+Unicode True
+
+!echo "Program Files: ${PROGRAMFILES}"
+
 # Version
 !define PRODUCT_VERSION "${VERSION}.0"
 VIProductVersion "${PRODUCT_VERSION}"
diff --git a/src/core/compile.c b/src/core/compile.c
index 5611b5e5..64893550 100644
--- a/src/core/compile.c
+++ b/src/core/compile.c
@@ -583,18 +583,21 @@ static int macroexpand1(
             es = janet_formatc("macro arity mismatch, expected at most %d, got %d", maxar, arity);
         c->result.macrofiber = NULL;
         janetc_error(c, es);
+        return 0;
     }
     /* Set env */
     fiberp->env = c->env;
     int lock = janet_gclock();
-    JanetSignal status = janet_continue(fiberp, janet_wrap_nil(), &x);
+    Janet tempOut;
+    JanetSignal status = janet_continue(fiberp, janet_wrap_nil(), &tempOut);
     janet_gcunlock(lock);
     if (status != JANET_SIGNAL_OK) {
-        const uint8_t *es = janet_formatc("(macro) %V", x);
+        const uint8_t *es = janet_formatc("(macro) %V", tempOut);
         c->result.macrofiber = fiberp;
         janetc_error(c, es);
+        return 0;
     } else {
-        *out = x;
+        *out = tempOut;
     }
 
     return 1;