#70: Minor language changes