Fixes for language changes.