diff --git a/build.cmd b/build.cmd
index d15bfea50..af093ab40 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,4 +1,6 @@
+@echo off
+
 REM Copyright (c) .NET Foundation and contributors. All rights reserved.
 REM Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-@powershell -NoProfile -NoLogo -File %~dp0scripts\build.ps1 %*
+powershell -NoProfile -NoLogo -File %~dp0scripts\build.ps1 %*
diff --git a/scripts/build.ps1 b/scripts/build.ps1
index ca0f3abdb..ebcc98a7e 100644
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@@ -9,7 +9,7 @@ param(
 $ErrorActionPreference="Stop"
 
 # Use a repo-local install directory (but not the artifacts directory because that gets cleaned a lot
-$env:DOTNET_INSTALL_DIR="$PSScriptRoot\.dotnet_stage0\win7-x64"
+$env:DOTNET_INSTALL_DIR="$(Convert-Path "$PSScriptRoot\..")\.dotnet_stage0\win7-x64"
 if (!(Test-Path $env:DOTNET_INSTALL_DIR))
 {
     mkdir $env:DOTNET_INSTALL_DIR | Out-Null
diff --git a/scripts/ci_build.cmd b/scripts/ci_build.cmd
index 43dfcfcde..029e1f655 100644
--- a/scripts/ci_build.cmd
+++ b/scripts/ci_build.cmd
@@ -1,8 +1,8 @@
+@echo off
+
 REM Copyright (c) .NET Foundation and contributors. All rights reserved.
 REM Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-@echo off
-
 CALL %~dp0..\build.cmd %*
 
 exit /b %errorlevel%
diff --git a/scripts/dotnet-restore.cmd b/scripts/dotnet-restore.cmd
index e6e5f6db7..c55412827 100644
--- a/scripts/dotnet-restore.cmd
+++ b/scripts/dotnet-restore.cmd
@@ -1,7 +1,8 @@
+@Echo OFF
+
 REM Copyright (c) .NET Foundation and contributors. All rights reserved.
 REM Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-@Echo OFF
 SETLOCAL
 SET ERRORLEVEL=