Polish changes following PR #3573
2 files changed