Finish language changes for 1.8