Completing the Windows 10 build