improve windows build