Merge "Fix compile warnings on windows."