Another update for language changes

Not sure if you're still working on this, but at least it compiled with these changes.