Corrected Windows build problems.