Fixing some TODOs of i18n