diff --git a/setup/pe/additions/Windows/System32/Winpeshl.ini b/setup/pe/additions/Windows/System32/Winpeshl.ini
index b983e2c7..942b466c 100644
--- a/setup/pe/additions/Windows/System32/Winpeshl.ini
+++ b/setup/pe/additions/Windows/System32/Winpeshl.ini
@@ -3,4 +3,4 @@
 wpeinit
 wpeutil InitializeNetwork
 wpeutil UpdateBootInfo
-"%SystemRoot%\System32\cmd.exe"
+"%SystemDrive%\Program Files\ConEmu\ConEmu64.exe", /cmd cmd
diff --git a/setup/pe/build_pe.ps1 b/setup/pe/build_pe.ps1
index c79c9c51..f3f80638 100644
--- a/setup/pe/build_pe.ps1
+++ b/setup/pe/build_pe.ps1
@@ -370,7 +370,6 @@ if ($MyInvocation.InvocationName -ne ".") {
   Write-Host "Recompressing image..."
   Move-Item "$TargetDir\media\sources\boot.wim" "$TargetDir\media\sources\boot-edited.wim"
   Export-WindowsImage -DestinationImagePath "$TargetDir\media\sources\boot.wim" -SourceImagePath "$TargetDir\media\sources\boot-edited.wim" -SourceIndex 1 -CompressionType Max
-  Remove-Item -Path "$TargetDir\media\sources\boot-edited.wim" -Force
 
   # Create ISO
   New-Item -Type Directory "$SetupDir\OUT_PE" 2>&1 | Out-Null