Fix up a few more bugs in build-winpe.ps1