Improve support for windows