Polish changes following PR #3173