[#2261] Minor tweaks