[#2998] Very minor tweaks