Fix issues with windows support