Fixed windows build and setup a little.