diff --git a/msvc/Makefile b/msvc/Makefile
index 816853bd2..842109c77 100644
--- a/msvc/Makefile
+++ b/msvc/Makefile
@@ -192,7 +192,8 @@ c\cut$(EXE): $(top_srcdir)\util\cut.c
 	cd ..
 
 $(TARGETS): ecl_min$(EXE) compile.lsp sysfun.lsp BUILD-STAMP
-	ECLDIR=$(PWD) .\ecl_min < compile.lsp
+	set ECLDIR=.
+	ecl_min < compile.lsp
 BUILD-STAMP: Makefile
 	date /t > $@
 
diff --git a/msvc/ecl/config.h.msvc6 b/msvc/ecl/config.h.msvc6
index d3f0b3052..d385038c0 100644
--- a/msvc/ecl/config.h.msvc6
+++ b/msvc/ecl/config.h.msvc6
@@ -407,4 +407,6 @@ typedef unsigned int uint32_t;
 #ifndef isfinite
 # define isfinite(x) (finite(x))
 # define signbit(x) (_copysign(1.0,(x)))
+# define ECL_MATHERR_CLEAR
+# define ECL_MATHERR_TEST
 #endif