i18n review: small fixes and @FIXME notes for devs