[#2994] Small tweaks to new standards