diff --git a/scripts/package/win-common.ps1 b/scripts/package/win-common.ps1
index 1e0607d4a..1c8cc2b2e 100644
--- a/scripts/package/win-common.ps1
+++ b/scripts/package/win-common.ps1
@@ -33,16 +33,16 @@ Function FinalizePackage {
     $Path
   )
 
-  CodeSignBinary (Join-Path $Path picard.exe)
-  CodeSignBinary (Join-Path $Path fpcalc.exe)
-  CodeSignBinary (Join-Path $Path discid.dll)
+  CodeSignBinary (Join-Path -Path $Path -ChildPath picard.exe)
+  CodeSignBinary (Join-Path -Path $Path -ChildPath fpcalc.exe)
+  CodeSignBinary (Join-Path -Path $Path -ChildPath discid.dll)
 
   # Move all Qt5 DLLs into the main folder to avoid conflicts with system wide
   # versions of those dependencies. Since some version PyInstaller tries to
   # maintain the file hierarchy of imported modules, but this easily breaks
   # DLL loading on Windows.
   # Workaround for https://tickets.metabrainz.org/browse/PICARD-2736
-  $Qt5BinDir = (Join-Path $Path PyQt5 Qt5 bin)
-  Move-Item (Join-Path $Qt5BinDir *.dll) $Path -Force
-  Remove-Item $Qt5BinDir
+  $Qt5BinDir = (Join-Path -Path $Path -ChildPath PyQt5\Qt5\bin)
+  Move-Item -Path (Join-Path -Path $Qt5BinDir -ChildPath *.dll) -Destination $Path -Force
+  Remove-Item -Path $Qt5BinDir
 }