More language fixes