diff --git a/run.ps1 b/run.ps1
index 3b27382468..34604c7175 100644
--- a/run.ps1
+++ b/run.ps1
@@ -52,8 +52,8 @@ in the file are overridden by command line parameters.
 Example config file:
 ```json
 {
-  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
-  "channel": "dev",
+  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
+  "channel": "master",
   "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
 }
 ```
@@ -192,7 +192,7 @@ if (!$DotNetHome) {
         else { Join-Path $PSScriptRoot '.dotnet'}
 }
 
-if (!$Channel) { $Channel = 'dev' }
+if (!$Channel) { $Channel = 'master' }
 if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
 
 # Execute
diff --git a/run.sh b/run.sh
index 02aac15874..4c1fed5646 100755
--- a/run.sh
+++ b/run.sh
@@ -220,7 +220,7 @@ if [ -f "$config_file" ]; then
             config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")"
             config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")"
         else
-            _error "$config_file contains invalid JSON."
+            __error "$config_file contains invalid JSON."
             exit 1
         fi
     elif __machine_has python ; then
@@ -228,7 +228,7 @@ if [ -f "$config_file" ]; then
             config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")"
             config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")"
         else
-            _error "$config_file contains invalid JSON."
+            __error "$config_file contains invalid JSON."
             exit 1
         fi
     elif __machine_has python3 ; then
@@ -236,11 +236,11 @@ if [ -f "$config_file" ]; then
             config_channel="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")"
             config_tools_source="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")"
         else
-            _error "$config_file contains invalid JSON."
+            __error "$config_file contains invalid JSON."
             exit 1
         fi
     else
-        _error 'Missing required command: jq or python. Could not parse the JSON file.'
+        __error 'Missing required command: jq or python. Could not parse the JSON file.'
         exit 1
     fi
 
@@ -248,7 +248,7 @@ if [ -f "$config_file" ]; then
     [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
 fi
 
-[ -z "$channel" ] && channel='dev'
+[ -z "$channel" ] && channel='master'
 [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
 
 get_korebuild
diff --git a/test/FunctionalTests/FunctionalTests.csproj b/test/FunctionalTests/FunctionalTests.csproj
index 5c8fa36506..a0c5f23b91 100644
--- a/test/FunctionalTests/FunctionalTests.csproj
+++ b/test/FunctionalTests/FunctionalTests.csproj
@@ -6,7 +6,6 @@
     <DefineConstants>$(DefineConstants);__remove_this_to__GENERATE_BASELINES</DefineConstants>
     <DefineConstants Condition="'$(GenerateBaseLines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
     <SignAssembly>false</SignAssembly>
-    <PublicSign>false</PublicSign>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
 
     <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net461'">win7-x64</RuntimeIdentifier>
diff --git a/testapps/Directory.Build.props b/testapps/Directory.Build.props
index 4d776f550d..c8b985bfca 100644
--- a/testapps/Directory.Build.props
+++ b/testapps/Directory.Build.props
@@ -19,6 +19,5 @@
     <!-- Override some repo-level properties not required for tests. -->
     <Version>1.0.0</Version>
     <SignAssembly>false</SignAssembly>
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">false</PublicSign>
   </PropertyGroup>
 </Project>
diff --git a/testapps/StrongNamedApp/StrongNamedApp.csproj b/testapps/StrongNamedApp/StrongNamedApp.csproj
index b2d66d2953..f76a4cc9f4 100644
--- a/testapps/StrongNamedApp/StrongNamedApp.csproj
+++ b/testapps/StrongNamedApp/StrongNamedApp.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
 
     <MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
   </PropertyGroup>