Update for language changes

Not sure why there are two extra commits here. I'll come back and check it out once I've made the other pulls.