diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 960400904..3aaee4e6e 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -167,7 +167,7 @@ function Start-PSPackage {
 
             # Replace binaries with crossgen'ed binaires from publish folder.
             Get-ChildItem -Recurse $Source | ForEach-Object {
-                $relativePath = $_.FullName -replace $Source, ''
+                $relativePath = $_.FullName.Replace($Source, '')
                 $publishPath = Join-Path $publishSource -ChildPath $relativePath
                 if (Test-Path -Path $publishPath)
                 {
diff --git a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
index b8f9d9eb5..b0a27274a 100644
--- a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
+++ b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
@@ -54,7 +54,7 @@ try{
     $env:platform = $null
 
     Write-Verbose "Sync'ing Tags..." -verbose
-    Sync-PSTags
+    Sync-PSTags -AddRemoteIfMissing
 
     Write-Verbose "Bootstrapping powershell build..." -verbose
     Start-PSBootstrap -Force -Package