[#2111] Minor language tweaks