Fix warning.
(cherry picked from commit c97ec5631bb08a2171a125008d2f0d2a75687aaa)
Windows build fixes.