Fixed windows build issuess.