Fix I18n and partners bugs