- Fix some Windows build issues.