Small changes missed in the original submission of 22482.
2 files changed