Added some Windows related fixes