#390: Minor language changes