Updated to check for Win32 more directly