[#2867] Minor tweaks