diff --git a/Makefile b/Makefile
index a2ccce8..250f0c3 100644
--- a/Makefile
+++ b/Makefile
@@ -14,10 +14,17 @@ debug:
 	$(REBAR_COMPILE) -C rebar.debug.config
 
 tests:
-	$(REBAR) eunit
+	mkdir .eunit
+	cp sqlite3.dll .eunit
+	$(REBAR_COMPILE) eunit
 
 clean:
-	del /Q deps ebin priv doc\* .eunit c_src\*.o
+	if exist deps del /Q deps
+	if exist ebin del /Q ebin
+	if exist priv del /Q priv
+	if exist doc\* del /Q doc\*
+	if exist .eunit del /Q .eunit
+	if exist c_src\*.o del /Q c_src\*.o
 
 docs:
 	$(REBAR_COMPILE) doc
diff --git a/build_port_win.bat b/build_port_win.bat
index 6196d33..4d7d70b 100644
--- a/build_port_win.bat
+++ b/build_port_win.bat
@@ -1,4 +1,4 @@
 @echo off
 call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\vcvars32.bat"
 
-nmake /f Makefile compile_c
\ No newline at end of file
+nmake /f Makefile compile
\ No newline at end of file