[#3017] Very minor tweaks