Fixing up windows support