Improving windows build config