Fix Windows build, take 2