diff --git a/.gitignore b/.gitignore
index f77b7e72b01..27c0297d074 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ bld/
 [Oo]bj/
 [Ll]og/
 [Dd]rops/
+[Dd]ocs/
 **/qir-gen.ll
 
 # Visual Studio 2015/2017 cache/options directory
diff --git a/bootstrap.ps1 b/bootstrap.ps1
index 15982134618..0365a9f856b 100644
--- a/bootstrap.ps1
+++ b/bootstrap.ps1
@@ -22,6 +22,7 @@ if (-not (Test-Path Env:AGENT_OS)) {
         Push-Location (Join-Path $PSScriptRoot "src/Simulation/Native")
             .\build-native-simulator.ps1
         Pop-Location
+        $Env:BUILD_CONFIGURATION = $null
     }
 
     Write-Host "Build simulation solution"
diff --git a/src/Qir/Runtime/build-qir-runtime.ps1 b/src/Qir/Runtime/build-qir-runtime.ps1
index b65cd80901f..fbca1e2c047 100644
--- a/src/Qir/Runtime/build-qir-runtime.ps1
+++ b/src/Qir/Runtime/build-qir-runtime.ps1
@@ -71,7 +71,7 @@ elseif (($IsWindows) -or ((Test-Path Env:AGENT_OS) -and ($Env:AGENT_OS.StartsWit
     Write-Host "##vso[task.logissue type=error;]Failed to identify the OS. Will use default CXX compiler"
 }
 
-$qirRuntimeBuildFolder = (Join-Path $PSScriptRoot "build\$Env:BUILD_CONFIGURATION")
+$qirRuntimeBuildFolder = (Join-Path $PSScriptRoot build $Env:BUILD_CONFIGURATION)
 if (-not (Test-Path $qirRuntimeBuildFolder)) {
     New-Item -Path $qirRuntimeBuildFolder -ItemType "directory"
 }
@@ -105,7 +105,7 @@ $osQirDropFolder = Join-Path $Env:DROPS_DIR QIR $os
 if (!(Test-Path $osQirDropFolder)) {
     New-Item -Path $osQirDropFolder -ItemType "directory"
 }
-$pattern | Foreach-Object { Copy-Item (Join-Path . bin $_) $osQirDropFolder }
+$pattern | Foreach-Object { Copy-Item (Join-Path . bin $_) $osQirDropFolder -ErrorAction SilentlyContinue }
 
 Pop-Location
 
@@ -115,4 +115,4 @@ $env:RC = $oldRC
 
 if (-not $all_ok) {
     throw "At least one project failed to compile. Check the logs."
-}
\ No newline at end of file
+}