Improve windows installation