Language fixes

Hopefully the language problems are now fixed.