Fix Windows warning regressions