Still fixing Windows build.