Ensure smooth sailing towards Windows 10 End of Support