diff --git a/activate.bat b/activate.bat
index 53f0e81..535e029 100644
--- a/activate.bat
+++ b/activate.bat
@@ -1,23 +1,14 @@
-FOR /r "C:\Program Files\Microsoft Visual Studio" %%G IN (*vcvars64.bat) DO (
-    SET "_file=%%G"
-    SET "_comp=%_file:\VC\=%"
-    IF NOT "%_comp%" == "%_file%" Call "%_file%"
-)
+SETLOCAL ENABLEDELAYEDEXPANSION
 
 FOR /r "C:\Program Files\Microsoft Visual Studio" %%G IN (*vcvars64.bat) DO (
     SET "_file=%%G"
-    SET "_comp=%_file:\VC\=%"
-    IF NOT "%_comp%" == "%_file%" Call "%_file%"
+    SET "_comp=!_file:\VC\=!"
+    IF NOT "!_comp!" == "!_file!" "!_file!"
 )
 
 FOR /r "C:\Program Files (x86)\Microsoft Visual Studio" %%G IN (*vcvars64.bat) DO (
     SET "_file=%%G"
-    SET "_comp=%_file:\VC\=%"
-    IF NOT "%_comp%" == "%_file%" Call "%_file%"
+    SET "_comp=!_file:\VC\=!"
+    IF NOT "!_comp!" == "!_file!" "!_file!"
 )
 
-FOR /r "C:\Program Files (x86)\Microsoft Visual Studio" %%G IN (*vcvars64.bat) DO (
-    SET "_file=%%G"
-    SET "_comp=%_file:\VC\=%"
-    IF NOT "%_comp%" == "%_file%" Call "%_file%"
-)
diff --git a/build.bat b/build.bat
index be61f18..9d61fb7 100644
--- a/build.bat
+++ b/build.bat
@@ -3,7 +3,7 @@ SET flags=-Od -ZI
 IF "%1" == "release" (
     SET flags=-O2
 )
-@echo on
+@ECHO on
 SET srcs=src\*
 mkdir bin obj
 cl %srcs% Ws2_32.lib -I inc %flags% -std:c++20 -MP -Fo:obj\\ -Fe:bin\\
diff --git a/export.bat b/export.bat
index d8b041a..ec38502 100644
--- a/export.bat
+++ b/export.bat
@@ -1,3 +1,4 @@
+@ECHO off
 SETLOCAL ENABLEDELAYEDEXPANSION
 
 Echo [ > compile_commands.json