[#2706] Very minor tweaks