Fix up i18n and nits