Fix windows support
More windows fixes