Fix Windows kitchen sink QA regressions