#72: Minor language changes