Additional updates for win support.