Another try at fixing windows build.