Fixing some extra todo of the i18next work