Fix Windows regressions