Improve the code for Windows package verificatinn. (dm)