More progress on support for Windows