compiler fixes for windows
more win fixes
one more fix, oops
Merge pull request #8638 from ricardoquesada/win_fixes

compiler fixes for windows