Bring windows installer inline with core