Another try in fixing the windows build.