#72: Additional language changes