[#3446] Minor tweaks as suggested by @xabbuh