Fix issues on Windows