Further work on windows support