Modifications required for Windows build