diff --git a/Makefile b/Makefile
index 5348decebc9..110c351d051 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,16 @@
+V             ?= 0
 CONFIGURATION = Debug
 MSBUILD       = xbuild /p:Configuration=$(CONFIGURATION) $(MSBUILD_ARGS)
 
+ifneq ($(V),0)
+MONO_OPTIONS += --debug
+MSBUILD      += /v:d
+endif
+
+ifneq ($(MONO_OPTIONS),)
+export MONO_OPTIONS
+endif
+
 all:
 	$(MSBUILD)
 
diff --git a/src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/UnzipDirectoryChildren.cs b/src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/UnzipDirectoryChildren.cs
index cd0f33eeebd..754e3422748 100644
--- a/src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/UnzipDirectoryChildren.cs
+++ b/src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/UnzipDirectoryChildren.cs
@@ -112,8 +112,11 @@ async TTask ExtractFile (string tempDir, string sourceFile, string relativeDestD
 					Log.LogMessage (MessageImportance.Low, $"mv '{fse}' '{dest}'");
 					if (Directory.Exists (fse))
 						Process.Start ("/bin/mv", $@"""{fse}"" ""{dest}""").WaitForExit ();
-					else
+					else {
+						if (File.Exists (dest))
+							File.Delete (dest);
 						File.Move (fse, dest);
+					}
 				}
 			}
 		}