Build fix for Windows
Merge pull request #1432 from sukhodolin/Fixes

Build fix for Windows