diff --git a/config.nims b/config.nims
index 265febe..7b58380 100644
--- a/config.nims
+++ b/config.nims
@@ -7,6 +7,22 @@
 # This file may not be copied, modified, or distributed except according to
 # those terms.
 
+if defined(windows):
+  # disable timestamps in Windows PE headers - https://wiki.debian.org/ReproducibleBuilds/TimestampsInPEBinaries
+  switch("passL", "-Wl,--no-insert-timestamp")
+  # increase stack size, unless something else is setting the stack size
+  if not defined(windowsNoSetStack):
+    switch("passL", "-Wl,--stack,8388608")
+  # https://github.com/nim-lang/Nim/issues/4057
+  --tlsEmulation:off
+  if defined(i386):
+    # set the IMAGE_FILE_LARGE_ADDRESS_AWARE flag so we can use PAE, if enabled, and access more than 2 GiB of RAM
+    switch("passL", "-Wl,--large-address-aware")
+
+  # Avoid some rare stack corruption while using exceptions with a SEH-enabled
+  # toolchain: https://github.com/status-im/nimbus-eth2/issues/3121
+  switch("define", "nimRawSetjmp")
+
 # begin Nimble config (version 1)
 when defined(windows):
   when fileExists("nimble-win.paths"):
diff --git a/json_serialization.nimble b/json_serialization.nimble
index b420b6b..5fa6b40 100644
--- a/json_serialization.nimble
+++ b/json_serialization.nimble
@@ -28,7 +28,7 @@ let verbose = getEnv("V", "") notin ["", "0"]
 let cfg =
   " --styleCheck:usages --styleCheck:error" &
   (if verbose: "" else: " --verbosity:0 --hints:off") &
-  " --skipParentCfg --skipUserCfg --outdir:build --nimcache:build/nimcache -f" &
+  " --outdir:build --nimcache:build/nimcache -f" &
   " -d:nimOldCaseObjects"
 
 proc build(args, path: string) =