Try to improve windows detection...