More windows changes.