diff --git a/source/dub/compilers/dmd.d b/source/dub/compilers/dmd.d
index 39d55d5..ed35530 100644
--- a/source/dub/compilers/dmd.d
+++ b/source/dub/compilers/dmd.d
@@ -114,7 +114,7 @@
 		import std.string;
 		auto tpath = Path(settings.targetPath) ~ getTargetFileName(settings, platform);
 		version(Windows){
-			string[] libs = settings.libs.map!(l => l~".lib")().array() ~ settings.sourceFiles;
+			string[] libs = settings.dflags.dup.filter!(l => l.endsWith(".lib"))().array() ~ settings.sourceFiles;
 			string arg = format("%s,%s,,%s", objects.join("+"), tpath.toNativeString(), libs.join("+"));
 			logDebug("link.exe %s", arg);
 			auto res = spawnProcess(["link.exe", arg]).wait();
diff --git a/source/dub/generators/build.d b/source/dub/generators/build.d
index 342bbc4..852bb51 100644
--- a/source/dub/generators/build.d
+++ b/source/dub/generators/build.d
@@ -179,7 +179,7 @@
 					auto dst = exe_file_path.parentPath ~ Path(f).head;
 					logDebug("  %s to %s", src.toNativeString(), dst.toNativeString());
 					try {
-						cleanup_files ~= dst;
+						if( settings.run ) cleanup_files ~= dst;
 						copyFile(src, dst, true);
 					} catch logWarn("Failed to copy to %s", dst.toNativeString());
 				}