Some polishing following PR #3384