#108: Additional language changes