Fixing compatibility with Windows Platforms