Fix Windows 10 Upgrade errors 8007002C, 80246007, 80070004, 80240020