Fix windows builds

Fix all windows builds after closes #8525