Add some support for Windows