Some refinements for Windows installation