Fix Windows build regressions