diff --git a/PSUtil/PSUtil.psd1 b/PSUtil/PSUtil.psd1
index c77a737..daf47bd 100644
--- a/PSUtil/PSUtil.psd1
+++ b/PSUtil/PSUtil.psd1
@@ -4,7 +4,7 @@
 	
 	# Version number of this module.
 
-	ModuleVersion = '2.2.35'
+	ModuleVersion = '2.2.38'
 	
 	# ID used to uniquely identify this module
 	GUID = '9ef51588-c40c-4064-910d-9b624b758cf6'
diff --git a/PSUtil/functions/explorer/Backup-PSULocation.ps1 b/PSUtil/functions/explorer/Backup-PSULocation.ps1
index 9b0e21d..c980821 100644
--- a/PSUtil/functions/explorer/Backup-PSULocation.ps1
+++ b/PSUtil/functions/explorer/Backup-PSULocation.ps1
@@ -28,7 +28,7 @@
 		$Levels = (Get-PSFConfigValue -FullName 'PSUtil.Path.BackupStepsDefault' -Fallback 1)
 	)
 	
-	Set-Location -Path (,".." * $Levels | Join-String -With ([System.IO.Path]::DirectorySeparatorChar))
+	Set-Location -Path (,".." * $Levels | Join-String -Separator ([System.IO.Path]::DirectorySeparatorChar))
 }
 
 Import-PSUAlias -Name "bu" -Command "Backup-PSULocation"
\ No newline at end of file
diff --git a/build/psf-build.ps1 b/build/psf-build.ps1
index 04f2850..c9641ca 100644
--- a/build/psf-build.ps1
+++ b/build/psf-build.ps1
@@ -10,6 +10,18 @@ param (
 	$WorkingDirectory = $env:SYSTEM_DEFAULTWORKINGDIRECTORY
 )
 
+#region Handle Working Directory Defaults
+if (-not $WorkingDirectory)
+{
+	if ($env:RELEASE_PRIMARYARTIFACTSOURCEALIAS)
+	{
+		$WorkingDirectory = Join-Path -Path $env:SYSTEM_DEFAULTWORKINGDIRECTORY -ChildPath $env:RELEASE_PRIMARYARTIFACTSOURCEALIAS
+	}
+	else { $WorkingDirectory = $env:SYSTEM_DEFAULTWORKINGDIRECTORY }
+}
+if (-not $WorkingDirectory) { $WorkingDirectory = Split-Path $PSScriptRoot }
+#endregion Handle Working Directory Defaults
+
 # Prepare publish folder
 Write-PSFMessage -Level Important -Message "Creating and populating publishing directory"
 $publishDir = New-Item -Path $WorkingDirectory -Name publish -ItemType Directory -Force
diff --git a/build/vsts-build.ps1 b/build/vsts-build.ps1
index 08513a9..6bc1aa2 100644
--- a/build/vsts-build.ps1
+++ b/build/vsts-build.ps1
@@ -10,9 +10,22 @@ param (
 	$WorkingDirectory = $env:SYSTEM_DEFAULTWORKINGDIRECTORY
 )
 
+#region Handle Working Directory Defaults
+if (-not $WorkingDirectory)
+{
+	if ($env:RELEASE_PRIMARYARTIFACTSOURCEALIAS)
+	{
+		$WorkingDirectory = Join-Path -Path $env:SYSTEM_DEFAULTWORKINGDIRECTORY -ChildPath $env:RELEASE_PRIMARYARTIFACTSOURCEALIAS
+	}
+	else { $WorkingDirectory = $env:SYSTEM_DEFAULTWORKINGDIRECTORY }
+}
+if (-not $WorkingDirectory) { $WorkingDirectory = Split-Path $PSScriptRoot }
+#endregion Handle Working Directory Defaults
+
 # Prepare publish folder
 Write-PSFMessage -Level Important -Message "Creating and populating publishing directory"
-$publishDir = New-Item -Path $WorkingDirectory -Name publish -ItemType Directory
+$publishDir = New-Item -Path $WorkingDirectory -Name publish -ItemType Directory -Force
+Remove-Item -Path "$publishDir\*" -Recurse -Force -ErrorAction SilentlyContinue
 Copy-Item -Path "$($WorkingDirectory)\PSUtil" -Destination $publishDir.FullName -Recurse -Force
 
 #region Gather text data to compile