[#3346] Minor tweaks