More windows build fix attempts.