Polish changes following PR #3173
2 files changed