I've been dealing with some odd Upgrade issues, and this topic has helped:

https://support.microsoft.com/en-us/help/929833/use-the-system-file-checker-tool-to-repair-missing-o...

The DSIM step and then the sfc step seem to take care of things. Right now, I am working with a 2nd gen i7, and I am going to use these steps on it, after I finish removing old W7 programs, such as Skype 7.4 still exists, along with the Skype embedded into W10.