Improved Windows OS detection