A couple of fixes to Windows detection.