Some more i18n and fix in discussion