Some extra i18next TODOs fixed