Fix the Windows build in relation to the recent changes.