#317: Minor language changes