common changes for windows build