A few more i10n / i18n replacements. Still use at own risk ;)