I think my suggestion in Post #2 , of re establishing the image, after the Windows 10 installation, will solve those problems.