Fix Windows build, take 3