Bug fixes with language settings