Misc changes about i18n, misc