More work to fix irritating Windows build