diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68ce639..025f468 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,11 @@
   not
   )
 
+# The Windows builder scripts pass -fuse-ld=lld.
+if (WIN32)
+  set(DEBUGINFO_TEST_DEPS ${DEBUGINFO_TEST_DEPS} lld)
+endif()
+
 # If we don't already have Python 3, throw away any previous results and try to
 # find it again.
 set(DEBUGINFO_UNSET_PYTHON3 OFF)
diff --git a/dexter/dex/builder/Builder.py b/dexter/dex/builder/Builder.py
index a2bab86..153c768 100644
--- a/dexter/dex/builder/Builder.py
+++ b/dexter/dex/builder/Builder.py
@@ -80,12 +80,14 @@
                 stderr=subprocess.PIPE)
             out, err = process.communicate()
             returncode = process.returncode
+        out = out.decode('utf-8')
+        err = err.decode('utf-8')
         if returncode != 0:
             raise BuildScriptException(
                 '{}: failed with returncode {}.\nstdout:\n{}\n\nstderr:\n{}\n'.
                 format(script_path, returncode, out, err),
                 script_error=err)
-        return out.decode('utf-8'), err.decode('utf-8'), builderIR
+        return out, err, builderIR
     except OSError as e:
         raise BuildScriptException('{}: {}'.format(e.strerror, script_path))
 
diff --git a/dexter/dex/builder/scripts/windows/clang.bat b/dexter/dex/builder/scripts/windows/clang.bat
index a83e4d4..4aa9e28 100644
--- a/dexter/dex/builder/scripts/windows/clang.bat
+++ b/dexter/dex/builder/scripts/windows/clang.bat
@@ -1,4 +1,4 @@
-setlocal EnableDelayedExpansion
+@setlocal EnableDelayedExpansion
 
 for %%I in (%SOURCE_INDEXES%) do (
   %PATHTOCLANGPP% -fuse-ld=lld -c !COMPILER_OPTIONS_%%I! !SOURCE_FILE_%%I! -o !OBJECT_FILE_%%I!