Changes for compilation in Windows