Fix issue with git export
Fix build on Windows