diff --git a/core/build.gradle b/core/build.gradle
index c4811700..434df1e0 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -38,7 +38,7 @@ android {
 task goBuild(type: Exec) {
     if (Os.isFamily(Os.FAMILY_WINDOWS)) {
         executable "cmd.exe"
-        args "/c", "src/overture/make.bat " + minSdkVersion
+        args "/c", "src\\overture\\make.bat " + minSdkVersion
     } else {
         executable "sh"
         args "-c", "src/overture/make.bash " + minSdkVersion
@@ -48,7 +48,7 @@ task goBuild(type: Exec) {
 task goClean(type: Exec) {
     if (Os.isFamily(Os.FAMILY_WINDOWS)) {
         executable "cmd.exe"
-        args "/c", "src/overture/clean.bat"
+        args "/c", "src\\overture\\clean.bat"
     } else {
         executable "sh"
         args "-c", "src/overture/clean.bash"
diff --git a/core/src/overture/clean.bat b/core/src/overture/clean.bat
index 488fef64..be184501 100644
--- a/core/src/overture/clean.bat
+++ b/core/src/overture/clean.bat
@@ -1,10 +1,10 @@
 @ECHO OFF
 
-SET DIR=%CD%
+SET DIR=%~dp0
 SET DEPS=%DIR%\.deps
 
-RD /SQ %DEPS%
-RD /SQ %DIR%\go\bin
-RD /SQ %DIR%\bin
+RD /S /Q %DEPS%
+RD /S /Q %DIR%\go\bin
+RD /S /Q %DIR%\bin
 
 ECHO "Successfully clean overture"
diff --git a/core/src/overture/make.bat b/core/src/overture/make.bat
index 065de4f8..fa23ba8b 100644
--- a/core/src/overture/make.bat
+++ b/core/src/overture/make.bat
@@ -5,7 +5,7 @@ IF NOT DEFINED ANDROID_NDK_HOME (
 	SET ANDROID_NDK_HOME=%ANDROID_HOME%\ndk-bundle
 )
 
-SET DIR=%CD%
+SET DIR=%~dp0
 SET MIN_API=%1%
 SET TARGET=%DIR%\bin
 SET DEPS=%DIR%\.deps