Polish changes following PR #3416
2 files changed