Fixing issuesin order to build on windows