diff --git a/examples/make.msvc.bat b/examples/make.msvc.bat
index 9d2823b..ce695ef 100755
--- a/examples/make.msvc.bat
+++ b/examples/make.msvc.bat
@@ -1,5 +1,5 @@
-if not exist obj\ mkdir obj
+if not exist tmp\ mkdir tmp
 
-cl -c -Zm200 -O2 -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\include" -I"..\include\loki" -Foobj\ Factory.cpp
+cl -c -Zm200 -O2 -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\include" -I"..\include\loki" -Fotmp\ Factory.cpp
 
-link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" obj\Factory.obj ..\lib\SmallObj.obj ..\lib\Singleton.obj 
\ No newline at end of file
+link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\Factory.obj ..\lib\SmallObj.obj ..\lib\Singleton.obj 
\ No newline at end of file
diff --git a/make.msvc.bat b/make.msvc.bat
index 0fceb94..1d7c809 100755
--- a/make.msvc.bat
+++ b/make.msvc.bat
@@ -2,7 +2,7 @@
 
 :: Toolkit 2003
 if defined VCToolkitInstallDir (
-	if exist "%VCToolkitInstallDir%\vcvars32.bat2" (
+	if exist "%VCToolkitInstallDir%\vcvars32.bat" (
 		echo -
 		echo - VC 7.1 Toolkit found.
 		echo -
@@ -15,9 +15,9 @@ if defined VCToolkitInstallDir (
 if defined VCINSTALLDIR (
 	if exist "%VCINSTALLDIR%\vcvarsall.bat" (
 		echo -
-		echo - Visual C++ 8 found.
+		echo - Visual C++  found.
 		echo -
-		call "%VCINSTALLDIR%\vcvarsall.bat x86"
+		call "%VCINSTALLDIR%\vcvarsall.bat" x86
 		set MSVCDir=%VCINSTALLDIR%
 		goto STARTCOMPILING
 	)
@@ -47,7 +47,6 @@ goto ERROR
 
 :: loki buid process
 
-
 cd src
 call make.msvc.bat
 cd ..
diff --git a/test/SafeFormat/make.msvc.bat b/test/SafeFormat/make.msvc.bat
index 4e5f0a4..16fc4d6 100755
--- a/test/SafeFormat/make.msvc.bat
+++ b/test/SafeFormat/make.msvc.bat
@@ -1,5 +1,5 @@
-if not exist obj\ mkdir obj
+if not exist tmp\ mkdir tmp
 
-cl -c -Zm200 -O2 -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -I"..\..\include\loki" -Foobj\ main.cpp
+cl -c -Zm200 -O2 -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -I"..\..\include\loki" -Fotmp\ main.cpp
 
-link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" obj\main.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj 
\ No newline at end of file
+link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\main.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj 
\ No newline at end of file
diff --git a/test/SmallObj/make.msvc.bat b/test/SmallObj/make.msvc.bat
index cb5c14b..a7eca25 100755
--- a/test/SmallObj/make.msvc.bat
+++ b/test/SmallObj/make.msvc.bat
@@ -1,5 +1,5 @@
-if not exist obj\ mkdir obj
+if not exist tmp\ mkdir tmp
 
-cl -c -Zm200 -O2 -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -I"..\..\include\loki" -Foobj\ SmallObjBench.cpp
+cl -c -Zm200 -O2 -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -I"..\..\include\loki" -Fotmp\ SmallObjBench.cpp
 
-link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" obj\SmallObjBench.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj
\ No newline at end of file
+link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\SmallObjBench.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj
\ No newline at end of file
diff --git a/test/flex_string/make.msvc.bat b/test/flex_string/make.msvc.bat
index 4e5f0a4..16fc4d6 100755
--- a/test/flex_string/make.msvc.bat
+++ b/test/flex_string/make.msvc.bat
@@ -1,5 +1,5 @@
-if not exist obj\ mkdir obj
+if not exist tmp\ mkdir tmp
 
-cl -c -Zm200 -O2 -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -I"..\..\include\loki" -Foobj\ main.cpp
+cl -c -Zm200 -O2 -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -I"..\..\include\loki" -Fotmp\ main.cpp
 
-link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" obj\main.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj 
\ No newline at end of file
+link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\main.obj ..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj 
\ No newline at end of file
diff --git a/tools/RegressionTest/make.msvc.bat b/tools/RegressionTest/make.msvc.bat
index 4197663..6fd242e 100755
--- a/tools/RegressionTest/make.msvc.bat
+++ b/tools/RegressionTest/make.msvc.bat
@@ -1,6 +1,5 @@
-if not exist obj\ mkdir obj
+if not exist tmp\ mkdir tmp
 
-cl -c -Zm200 -O2 -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -I"..\..\include\loki" -Foobj\ Test.cpp
+cl -c -Zm200 -O2 -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -I"..\..\include\loki" -Fotmp\ Test.cpp
 
-link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" obj\Test.obj 
-::..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj 
\ No newline at end of file
+link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\Test.obj