[#3198] Minor tweaks