Global
- fixes for Windows build